restore user.rb model
Merge branch 'master' of github.com:github15693/rms
Change Api Bulletin, Event, House Rule
merge
fix rms booking and new show booking api