finalized API stuff
Merge branch 'master' into rest-api-setup

Conflicts:
	tasky/Models/Story.cs
final update for API