minor changes
Merge branch 'master' of https://github.com/chyblog/ng-server.git

Conflicts:
	src/main/java/com/ngserver/mvc/action/MainController.java