Merge branch 'v1.0.6-ios' of git.atmob.com:Atmob-Flutter/ElectronicAssistant into v1.0.6-ios

# Conflicts:
#	pubspec.yaml