add something important

add something important
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/waimai/dao/UserDao.java
	src/main/java/com/waimai/model/User.java
	src/main/resources/jdbc.properties
	src/main/resources/log4j.properties
	target/classes/com/waimai/dao/UserDao.class
	target/classes/com/waimai/model/User.class
	target/classes/jdbc.properties
	target/classes/log4j.properties