rebulid to maven project
Merge branch 'master' of https://github.com/tiaochong/journey

Conflicts:
	.project