Added many failing / incomplete user stories and user factories
Merge branch 'admin' of github.com:Berkeley169/fight_Impunity_Haiti into admin
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti into admin
Merged in master
Added new features and modified user factories
Merge branch 'master' into user_stories
Fixed feature bugs and modified user factory