Clean up
Tómas commit
Merge branch 'master' of https://github.com/Loknar/atburdaskraning

Conflicts:
	my_web_assets/sqlite/events_website.db