Merge branch 'hotfix/0.1.2'
Merge branch 'release/0.2'
import the avatars app *after* the users app
Merge branch 'hotfix/0.2.1'
Merge branch 'hotfix/0.2.1' into develop
not using select2 anymore
Merge branch 'hotfix/0.2.2'
Merge branch 'hotfix/0.2.2' into develop
silly migrations
Merge branch 'hotfix/0.2.3'
Merge branch 'hotfix/0.2.3' into develop
change to the way Heroku suggests defining the STATICFILES_DIR
Merge branch 'hotfix/0.2.4'
Merge branch 'hotfix/0.2.4' into develop
damn staticfiles paths
Merge branch 'hotfix/0.2.5'
Merge branch 'hotfix/0.2.5' into develop
damn parantheses
Merge branch 'hotfix/0.2.6'
Merge branch 'hotfix/0.2.6' into develop