Merge branch 'develop'
database.yml removed from repo
Gmail and dropbox configuraiton is now defined as ENV using figaro
Merge branch 'master' into develop
avatarDs can no be added to users