Clearing up errors related to Spring
Merge branch 'master' of https://github.com/brnharp/bazinga.git
2014-01-28 ui changes