test
test
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