Fix bug in selfie request handling
Image style fixes
Merge branch 'master' into selfie

Conflicts:
	app/src/main/webapp/WEB-INF/views/home.html