Added shifts_type to partial
Merge branch 'master' of heroku.com:ambassador-portal
Fixed manage user shifts display when a user has multiple shifts