add new controll
add new controll
Merge branch 'shin' of github.com:github15693/rms into shin
Add delete facility
Merge branch 'hung'
Facility Edit,New
Facility merge
Change table bulletins
Merge branch 'hung'
Change some thing in routes
Add gem timepicker
Add timepicker file
Change bulletin from condo_id to user_id
Update db diagram 18/07/2014
Re-create bookings resource
db migrate bookings
merge khanh - master