fix
Merge branch 'master' of https://github.com/tzwm/DriftLibrary

Conflicts:
	WebContent/WEB-INF/classes/applicationContext.xml