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

Conflicts:
	public/dist/eventa.min.css
	public/dist/eventa.min.js
	public/generated/application.js
	public/generated/application.min.js
	public/generated/template.js