Refactor shift helpers and add API controller
Merge branch 'master'

Conflicts:
	app/models/shift.rb
	app/models/user.rb
	db/schema.rb