Bluh
Merge branch 'master' of https://github.com/Roshan931/Shoutfit

Conflicts:
	platforms/android/assets/www/js/best.js
	platforms/android/assets/www/js/vote.js