Preview
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app

Conflicts:
	platforms/ios/www/index.html
	platforms/ios/www/js/serverRequest.js
if if
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app