trying to add user-skills to events
Merge branch 'event-request' of https://github.com/JohnBarton27/Tangible-Scheduler.git into user-roster

Conflicts:
	app/models/event.server.model.js
	public/modules/events/controllers/events.client.controller.js
"View Skillset" pages now show all users with that skill (in
alphabetical order)
Merge remote-tracking branch 'origin/user-roster' into user-roster