fixed the fixtures and need to pull
had conflicts with pull
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
validation for client side and model
fixed commit errors