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

Conflicts:
	platforms/ios/www/css/style.css
login iphone
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app

Conflicts:
	platforms/ios/www/css/small.css
	platforms/ios/www/js/facebook.js