welcomes_controllers
merge branch 'hung' of github.com:github15693/rcs into khanh
fix booking - privileges api 21082014