Fixing project issues
Merge branch 'master' of https://github.com/franticdeli/MarqSpring2014.git