tweaks & extending collapse directive
Merge branch 'master' of github.com:gvn/webmaker-events

Conflicts:
	app/index.html
tweaks