Merge branch 'master' of github.com:tviund/sciencetrip_signup into master-create-events

Conflicts:
	client/app/events/events.create.controller.js
	client/app/events/events.create.html