Have resolved conflicts
Corrected the user factory
Merge branch 'master' of https://github.com/techvision/brails4
Added vender/files
Removed vendor/unwanted files