removed orientdb-kt
removed orientdb-kt
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main.js
	views/toolbar/hardware.jade
	views/toolbar/room.jade
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/main.js
	views/toolbar/hardware.jade
	views/toolbar/room.jade