convert incident types to store/viewstate paradigm
Merge branch 'master' of https://github.com/gregarious/lilypad-pace

Conflicts:
	frontEnd/main/student/collect/incidentLog.html
	frontEnd/main/student/collect/incidentLog.js
	frontEnd/modals/behaviorSettings.html
	frontEnd/partials/behaviorSettings.js