develop
feature/add_translations
feature/cleanup
feature/defaults
feature/django110
feature/general_update
feature/include
master