add changelog to master, update with period label info
style tweaks to support long period names
attendance span bugfix
bugfix bugfix
update changelog on master
misc settings cleanup
make period labels optional in forms
fix post save hook for classroom permissions
fix cascading delete problem
bugfix
Merge branch 'master' into kettle-deployment

Conflicts:
	requirements/production_kettle.txt