uat v1
Merge branch 'devs' of https://github.com/pplc01/crimezone into devs

Conflicts:
	CrimeZone/CrimeZone/src/main/res/layout/comment_item.xml
	CrimeZone/CrimeZone/src/main/res/layout/newsfeed_item.xml