fixing dashboard and working on admin security
working on authoriziation
Merge branch 'master' into Sharon
more work on security
Merge pull request #41 from blind-squirrel/Sharon

Sharon