Fixes #23
Merge branch 'master' of https://github.com/sathishk/zols

Conflicts:
	webmvc/src/main/java/org/zols/web/config/ApplicationConfiguration.java