Merge branch 'hotfix/add_heroku_assets_fix'
Merge branch 'release/social_media_integration'
Added avatar_id to Monologue::User
Merge branch 'develop' of github.com:CodePolaris/eidos into develop