,
Merge branch 'master' of
https://github.com/ThomasKiencke/luposdate.cloud.git

Conflicts:
	src/main/resources/core-site.xml
	src/main/resources/mapred-site.xml