Merge branch 'master' of https://github.com/amarbayar/jams

Conflicts:
	WebContent/WEB-INF/applicationContext.xml
	WebContent/WEB-INF/views/home.jsp
	target/classes/.gitignore