#
waiting text vote
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app

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

Conflicts:
	platforms/ios/www/css/normal.css
	platforms/ios/www/js/serverRequest.js
banner etc.
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app
morning
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app
fix norml