New git
Merge branch 'master' of https://github.com/webinfojun/DuduHome

Conflicts:
	pom.xml
	src/main/java/com/duduhome/simpleweb/SimpleWebApiResources.java
	src/main/java/com/duduhome/simpleweb/data/Note.java
	src/main/java/com/duduhome/simpleweb/data/NoteDaoMySQLImpl.java
	src/main/resources/assets/index.htm
	src/main/resources/assets/js/message.js
	src/test/java/NoteDaoMySQLImplTest.java