thy
change user_type into user_group
Merge branch 'dev' of github.com:JYWa/teamstyle16 into dev
rectify some other problems caused by the difference of user_type and user_group, we now use user_type,update your database