Spring MVC deployment fix
Merge remote-tracking branch 'origin/master'
File transfer to Nick