Changed branch to develop because skyrocketing feature (do I even need this?) is only available in that branch. I hope nothing breaks...
Merge branch 'develop' of https://github.com/AKSW/OntoWiki into develop

Conflicts:
	application/config/default.ini
	application/tests/integration/OntoWiki/Model/InstancesIntegrationTest.php
	debian/changelog
	debian/control