Spring MVC initial Commit
Resolved conflict