New_feed UI is changed
Merge branch 'master' of https://github.com/reach2arunprakash/TrustedVicinity

Conflicts:
	TrustedVicinity/res/values/strings.xml