Update the code to make the whole business workflow working.
Merge branch 'master' of https://github.com/prod-dev/travel

Conflicts:
	src/main/webapp/content/views/home.jsp
Update the home page for merge