use naturaltime for elapsed times (resolves #229)
Merge pull request #232 from brente/ago-naturaltime

Use naturaltime for elapsed times
speed up dashboard queries by using select_related (fixes #233)
update jqPlot (resolves compatibility issues with jQuery 1.9+)
fix typo in template condition
User menu = User settings, Change password, Logout
Nav: use full user name, if available, fix icon
Bootstrap version of the user settings form
Merge pull request #235 from brente/master

Report charts not working: update jqPlot
Merge pull request #236 from brente/fix-typo

fix typo in template condition
Merge pull request #237 from brente/user-menu

User menu
Merge branch 'master' into custom-staff-filter