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 i18n-update
Merge branch 'i18n-update' into i18n

Conflicts:
	helpdesk/templates/helpdesk/user_settings.html