add configuration
Merge branch 'master' into feature/static_pages
no more static
Merge branch 'feature/static_pages' into develop