Turned text output off

And fixed collisions
Merge remote-tracking branch 'origin/master' into tmpsynchbranch
Merge branch 'master' of https://github.com/BTHAgileProject2014/BO360