Helpshift integration
Merge branch 'dev' into 'master'

Conflicts:
	Main/HelpingFaceless/AndroidManifest.xml
	Main/HelpingFaceless/res/layout/profile_view.xml
	Main/HelpingFaceless/res/values/strings.xml

Main/HelpingFaceless/src/in/amolgupta/helpingfaceless/activities/HFBaseA
ctivity.java

Main/HelpingFaceless/src/in/amolgupta/helpingfaceless/activities/HomeAct
ivity.java
	Main/HelpingFaceless/src/in/amolgupta/helpingfaceless/common/App.java