temp commit
Merge branch 'master' of https://github.com/Niv-Mizzet/bann-pom.git

Conflicts:
	bannpom/views/schedule.py
Merge branch 'master' of https://github.com/Niv-Mizzet/bann-pom.git
qwertyu
Merge branch 'master' of https://github.com/Niv-Mizzet/bann-pom.git