clean up
Main merge
changes to controller and model. added a way of id-ing models
changes to controller. added way to id models. Other checkstyle/refactoring etc.
Merge branch 'master' of https://github.com/th365thli/SLogo