Added type option to user bar block
Text correction
Merge branch 'user' of https://github.com/pi-engine/pi into user
Fix for database row save exception catch
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #619 from liuchuangww/user

Fix user email template
Merge remote-tracking branch 'upstream/user' into user
Change nav