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

Conflicts:
	FlickrAnalyser/src/com/flickranalyser/html/ServletCreateSpot.java
	FlickrAnalyser/war/flickranalyser.jsp