Better populating
Merge pull request #61 from conorfennell/master

Better populating
Update tag schema
Merge pull request #62 from jgho/updateTagSchema

Update tag schema
Change from tag id to tag
Merge pull request #63 from conorfennell/master

Change from tag id to tag
Update data_loader to match new tag schema
Merge pull request #64 from FCStrike/master

Update data_loader to match new tag schema
Send back user id on login
Merge pull request #65 from conorfennell/master

Send back user id on login
Change status code to 400 from 403
Merge pull request #66 from jgho/statusCode

Change status code to 400 from 403
Add inactive category to tag model
Add active property to tag in preparation for deletion function
Merge pull request #67 from FCStrike/master

Add active property to tag model in preparation for deletion function
Update data_loader to only assign categories with type tag to tags
data loader updated and regeister on first login
seperate tokens and routes for user and admin
Merge pull request #69 from conorfennell/master

login changes
Merge pull request #68 from FCStrike/master

Update data_loader to only assign categories with type tag to tags