email 模板和配置文件
test
mytest
test
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/zchen01/hn-project into tt

Conflicts:
	hn-platform/hn-travel-persist/src/test/java/org/springside/examples/quickstart/repository/TaskDaoTest.java
Merge branch 'dev' of https://github.com/zchen01/hn-project into dev