Merge branch 'new_context' into 'master'

djangoldp/conf/default_settings.py

djangoldp/conf/server_template/settings.yml

djangoldp/tests/scripts/skills.json

djangoldp/tests/tests_auto_author.py

djangoldp/tests/tests_cache.py

djangoldp/tests/tests_inbox.py

djangoldp/tests/tests_permissions.py

djangoldp/tests/tests_post.py

djangoldp/tests/tests_update.py

djangoldp/tests/tests_user_permissions.py