fixed the backend tests
fixed front end tests
refactored the users page and controller slightly
more refactoring to remove the 'event' term
more refactoring for the activities
ready to do some more work on the activities
committing because I'm going crazy and need to rethink things
making more sense of the activities stuff now
deleting an activity is now possible
small adjustment to the api specs
hacked together the timeline directive
date time picker working now... just some tidy up of interactions to be done.. and a bunch of testing
build
merge branch to master