Merge branch 'dev', remote-tracking branch 'origin' into guidev
removed some debugging console outputing
Merge pull request #1298 from thearn/guidev

Guidev