no message
Merge branch 'master' of https://github.com/trienvu/turtapp

Conflicts:
	turtapp/WebContent/WEB-INF/applicationContext.xml
	turtapp/src/turtapp/service/SimpleEmployeeManager.java