Changes made for Ubuntu
Merge branch 'master' of https://github.com/karthickow/Spring4WebApp