merging changes from SVN repo; mostly UI changes to WebMVC project