Fix test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/nl/astraeus/jdbc/web/page/Page.java
Move to Simple-web