No changes, just some blank lines removed
Merge branch 'master' of https://github.com/krstlb/timewhale_framework

Conflicts:
	index.html
	js/addeventpage.js

Fixed.