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

Conflicts:
	public/dist/eventa.min.css
	public/dist/eventa.min.js