[COS] Userservice
Merge branch 'master' of https://github.com/csscheuermann/flickranalyser

Conflicts:
	FlickrAnalyser/war/WEB-INF/spotAPI-v1.api