Merge branch 'v1.3.0' of http://git.atmob.com:28999/Atmob-Flutter/Clean into v1.3.0

# Conflicts:
#	pubspec.yaml