Merge branch 'hotfix' into develop
Merge branch 'craig' into develop
fixed user views
added Workevent Add
Added work even update
Fixed more stuff
Added work_event_delete
git ignore updated
Merge pull request #11 from csalajan/master

Working Fixes