test1 ?
Merge branch 'master' of https://github.com/judos/fisk.git

Conflicts:
	WEB-INF/src/view/tests/Test1.java