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

Conflicts:
	ShareYourSpot_Client/src/de/hska/shareyourspot/android/restclient/RestClient.java