UI bug fixed
Merge branch 'master' of https://github.com/bjerkins/xSchool

Conflicts:
	xSchool/db.sqlite3
	xSchool/settings.pyc