Executor to generate thumbs
Merge branch 'master' of https://github.com/jpwilsch/photoshow

Conflicts:
	src/main/java/photoshow/service/AdminServiceImpl.java