- 9-patch splashscreens added for Android, this should prevent them from being stretched.
Merge origin/master

Conflicts:
	www/js/controllers.js