style changes
Bulk import work in progress.
Merge branch 'master' of github.com:tviund/sciencetrip_signup

Conflicts:
	.gitignore
	client/app/admin/admin.js
	client/app/events/events.controller.spec.js
	client/app/events/events.create.controller.js
	client/app/events/events.create.controller.spec.js
	client/app/events/events.create.html
	client/app/events/events.details.controller.js
	client/app/events/events.details.html
	client/app/events/events.js
	server/api/event/event.controller.js
	server/api/event/event.model.js
	server/api/event/event.spec.js
	server/api/group/group.spec.js
	server/api/org/org.spec.js