Event collection
Merge branch 'master' of github.com:kesapojat/codebrowser-web-client

Conflicts:
	static/assets/js/codebrowser-min.js