Merge branch 'master' into module-port
move rtscomment to historybutton
add "number" setting type
basic port QueueTools module to tbobject

ref #251
Merge branch 'module-port'

Conflicts:
	modules/notifier.js - moved cache settings