XML User Store
Resolved 

Merge branch 'master' of https://github.com/meca1012/ShareYourSpot.git

Conflicts:
	ShareYourSpot_Client/res/layout/activity_post_list.xml