Merge branch 'dev' into docs

.gitignore

api/tests.py

applications/models.py

applications/templates/applications/application/detail.html

applications/urls.py

applications/views.py

core/permissions.py

datasources/apps.py

datasources/connectors/base.py

datasources/connectors/csv.py

datasources/forms.py

datasources/migrations/0031_default_connector_name.py

datasources/models.py

datasources/search_indexes.py

datasources/tests/test_connectors.py

datasources/tests/test_connectors_hypercat.py

datasources/views/datasource.py

datasources/views/licence.py

datasources/views/user_permission_link.py

deploy/uwsgi/sites/pedasi.ini