merge: merged settings

.gitignore

djangoldp/activities/services.py

djangoldp/models.py

djangoldp/permissions.py

djangoldp/serializers.py

djangoldp/tests/fixtures/test.json

djangoldp/tests/fixtures/test_1000.json

djangoldp/tests/fixtures/test_ten_1000.json

djangoldp/tests/models.py

djangoldp/tests/perf_result.csv

djangoldp/tests/performance_runner.py

djangoldp/tests/runner.py

djangoldp/tests/scripts/test_data_generator.py

djangoldp/tests/tests_inbox.py

djangoldp/tests/tests_perf_get.py

djangoldp/tests/tests_performance.py

djangoldp/tests/tests_save.py

djangoldp/tests/tests_temp.py

djangoldp/tests/tests_update.py

djangoldp/views.py