added 'ticket' and 'userProfile' to the resources for the API
Merge branch 'api' of ssh://github.com/darrenburns/TeamProject3 into alter-tickets
Merge branch 'alter-tickets' of ssh://github.com/darrenburns/TeamProject3 into alter-tickets
UI for ticket notes