Maraki's updates + some debugging: this is for you abby
Merge branch 'master' of https://github.com/trautmaa/Task-Manager-Comps-2014-2015.git