Merge branch 'master' into gh-pages
Got splashscreen and app icon working
Merge branch 'gh-pages'

Conflicts:
	ios/www/js/libs/googleapis.js