FTP- Upload Basic
Merge branch 'master' of https://github.com/meca1012/ShareYourSpot.git

Conflicts:
	ShareYourSpot_Client/res/layout/newgroup.xml