Fix properties
Merge remote-tracking branch 'origin/angular-server' into develop
Cordova loader.
Cordova loader.
Fixed uncaught exception in database.
Merge branch 'develop'

Conflicts:
	public/index.html