working on configuration page
Merge origin/master

Conflicts:
	devDb.h2.db
	devDb.lock.db
	grails-app/controllers/net/xpresstek/zrosterlight/ConfigurationController.groovy
	grails-app/views/configuration/index.gsp