modify rake db:populate to also populate UserLanguages; add enum in action and gender'
Merge branch 'development' into feature/user-languages
Fix tests to provide access token in request headers
Merge from development branch
Implement create association of user languages during user creation
implement friend controller and tests
Rename friend model to friendship
Add test data entries population for friendship
Remove unused update_language method in users controller
Move friendship list from users to friendship controller
change to use dotenv to set environment variable and set up CORS to only open up to a certain client path
implement avatar upload and include tests
implement feature to return friends list and matches list
Fix problems with tests after removing proficiency table
rake db:populate fails due to avatar. Commented out lines to keep development cycle running
Add and implement controller to return list of all languages
implement and modify as_json methods for action, user and user_language models
fixed merge conflict in user
fixed all conflicts
add rails_12factor gem for heroku