Merge branch 'master' of https://github.com/freelook/EVENTA

Conflicts:
	public/generated/template.js
	public/modules/events/views/list-events.client.view.html