adding lot of changes
Merge branch 'master' of https://github.com/saurav-mbe/shubhapp

Conflicts:
	platforms/android/CordovaLib/ant-build/build.prop
	platforms/android/ant-build/HelloCordova-debug-unaligned.apk
	platforms/android/ant-build/HelloCordova-debug.apk
	platforms/android/ant-build/HelloCordova.ap_
	platforms/android/ant-build/HelloCordova.ap_.d
	platforms/android/ant-build/build.prop
	platforms/android/assets/www/css/style.css
	platforms/android/assets/www/js/controllers.js
	platforms/android/assets/www/js/services.js
	platforms/android/assets/www/templates/friend-detail.html
	www/css/style.css
	www/js/controllers.js
	www/js/services.js
	www/templates/friend-detail.html