fixed user form
more model testing
Merge branch 'dev' of https://github.com/strivedi183/checkmate into dev