~ changed arguments
Merge branch 'master' of https://github.com/judos/fisk.git

Conflicts:
	WEB-INF/src/view/HtmlRender.java