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

Conflicts:
	platforms/ios/www/css/style.css
>>>HEAD