Factory Girl issues fixed
Merge branch 'dev' of https://github.com/strivedi183/checkmate into dev