code cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/jgl/log.js
code cleanup