fix cs issues
Merge branch 'develop' of github.com:AKSW/OntoWiki into upstream

Conflicts:
	extensions/defaultmodel/DefaultmodelPlugin.php
Merge branch 'develop' of github.com:AKSW/OntoWiki into upstream
Merge branch 'develop' of github.com:AKSW/OntoWiki into upstream
Merge branch 'develop' of github.com:AKSW/OntoWiki into upstream
fix order of extension configuration array

this is a workaround
see feature request https://github.com/AKSW/OntoWiki/issues/115
Merge remote-tracking branch 'upstream/develop' of github.com:AKSW/OntoWiki into upstream
Merge branch 'develop' of github.com:AKSW/OntoWiki into upstream
remove files extension leftover
Merge remote-tracking branch 'upstream/develop' into upstream