Final changes. Altered queries for constraint
Merge branch 'master' of https://github.com/shekbagg/nus-facility-booking