[GAE Server] Code refactor
Merge branch 'develop' of github.com:usersource/anno into feature/ios-notification
Merge branch 'develop' of github.com:usersource/anno into feature/ios-notification
Merge branch 'develop' of github.com:usersource/anno into feature/ios-notification

Conflicts:
	anno_gec_server/helper/settings.py
[GAE Server] Resolved conflict after stash pop
Merge branch 'develop' of github.com:usersource/anno into feature/ios-notification
[Anno App] Set 'showLoadingSpinner' as false for user.favorite_apps.list
[iOS] Added certificate and key for push notification
Merge branch 'feature/ios-notification' into develop