Multi module project
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/src/main/java/com/windreaver/controllers/MainController.java
	server/src/main/webapp/WEB-INF/jsp/index.jsp
	server/src/main/webapp/WEB-INF/spring-servlet.xml
	server/src/main/webapp/WEB-INF/web.xml