Initial Commit: Adding standard spring mvc based application
resolving merge conflict