~ Refactored view.test package to view.server and Test1 class to Server.
Merge branch 'master' of https://github.com/judos/fisk.git

Conflicts:
	WEB-INF/src/view/tests/Test1.java
Merge branch 'master' of https://github.com/judos/fisk.git