before BM update
Merge http://github.com/chuckawe/SchoolTools

Conflicts:
	detent.py