Cleaned up quite a bit, added a content controller and renamed the models in the ModelAndView objects
MERGED
Fixed failing tests and did a manual merge of previous changes