nothing
Merge branch 'hung' of github.com:github15693/rms into khanh
api privileges
Merge branch 'hung' of github.com:github15693/rms into khanh
upload api chat
api chats
complete chat api
module authoriation
fix conflict
test guard house
test guard house
change 05082014
change 05082014
write api setting rcs
commit db:seed
finish module authoriation
pull master and fix
change module facility
Merge branch 'master' of github.com:github15693/rms
change booking - event and add i18n