simpleserver
Merge branch 'master' of https://github.com/robertsing/java2html

Conflicts:
	Main/src/main/beans/base/DOCTYPE.java
	Main/src/test/util/SimpleServer.java