Merge pull request #2 from JasonGuanGitHub/master

pull from the master
Merge pull request #2 from JasonGuanGitHub/master

pull request
Merge pull request #1 from JasonGuanGitHub/master

update
Merge pull request #32 from jitongming/master

merge request from JasonGuan
Merge pull request #33 from jitongming/master

update appointments_controller/group_name
选择时间 控件     预约详情
Merge pull request #34 from luzhitong/master

选择时间 控件     预约详情
header footer  详情
add register function

fixed appointment time
Merge pull request #35 from luzhitong/master

header
Merge branch 'master' of github.com:JasonGuanGitHub/EasyUse
display lift panel by privilige
distribute priviliges to role
Merge branch 'master' of github.com:specialhappy/EasyUse
fixed select appointment time
fixed add an appointment without login
Merge pull request #36 from specialhappy/master

display left panel by privilige and distribute priviliges to role
Merge pull request #2 from JasonGuanGitHub/master

Merge pull request #1 from JasonGuanGitHub/master
terminal 挡着
pay 挡着
登陆 注册 挡住