minor logging
changed comment
merging and fixing up entity a little
merging controller
fixing static names
fixing static names
removing more static variables
Merge branch 'chrisekelley-master'