Resolved circular dependencies
Merge branch 'master' of https://github.com/Astvaldur/ES-Project-Spring-2014