Added: Comment.
Finish D (again)

Conflicts:
	test-conflicts.php
Merge branch 'develop'