layout and stuff
Merge branch 'develop' of https://github.com/florensh/wefactor into develop

Conflicts:
	src/main/resources/templates/entrydetails.html