added location support
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/dist/eventa.min.js
	public/generated/application.js
	public/generated/application.min.js
	public/modules/events/controllers/events.client.controller.js
	public/modules/events/services/eventSettings.client.service.js
Merge branch 'master' of https://github.com/freelook/EVENTA
Merge branch 'master' of https://github.com/freelook/EVENTA
added map to create view
Merge branch 'master' of https://github.com/freelook/EVENTA
added map to create view