module authoriation
fix conflict
commit db:seed
finish module authoriation
pull master and fix