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

Conflicts:
	.gitignore
	platforms/ios/www/html/friends.html
	platforms/ios/www/js/search.js