Merge branch 'dev' into thy
change User_group into user_type
add navbar containing user's information and functions to the header
add error report section, need to debug
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
Merge branch 'thy' into dev