added 'curnit' as required config.json key
Merge branch 'master' of github.com:encorelab/evoroom4

Conflicts:
	js/evoroom.js
teacher tablet work-in-progress
Merge branch 'master' of github.com:encorelab/evoroom4