updarte
Merge branch 'master' of https://github.com/lriStack/lrihackfest

Conflicts:
	platforms/ios/www/createProfile.html
	platforms/ios/www/js/createProfile.js