new add
Merge branch 'master' of https://github.com/hooom/OLMS.git

Conflicts:
	WebContent/WEB-INF/applicationContext.xml