ghfh
Merge branch 'develop' of https://github.com/pasangsherpa/crapogram into develop

Conflicts:
	sunappugram/res/values/strings.xml

//-----------New changes below
Added logout button and settings button functionality in user's dashboard view