Merge branch 'master' into issue-430-content-negotiation

Conflicts:
	lodmill-ui/app/controllers/Application.java