These shouldnt actually be here
Merge branch 'master' of github.com:headdetect/TaskerSlave