Merge branch 'master' of github.com:Rudeg/Spring-MVC-Example