authentication upgrade
factory_girl ` n ` test cleanup
Merge branch 'develop'