Check if ReflectionMethod::getDocComment is working
adopt new settings style
Merge branch 'master' into test_annotations_working

Conflicts:
	lib/private/util.php
adding annotation check to checkServer()
Merge pull request #7614 from owncloud/test_annotations_working

Check if ReflectionMethod::getDocComment is working