Rollback to b
Merge branch 'master' of https://github.com/krstlb/timewhale_framework

Conflicts:
	js/addeventpage.js