fixed time taken calculation, added user delete option to admin tools
Merge remote-tracking branch 'origin/master'