Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	js/nativeControllers.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	js/nativeControllers.js