fix logging, minor stuff.
robot arm
Merge branch 'master' into dev

Conflicts:
	js/codemirror/searchcursor.js
Merge pull request #143 from increpare/dev

Dev