ommitting local
fixing merge problems
Permission changes
Merge branch 'master' into HEAD
Renamed annual report