Changed: $i = 'D';
Finish D

Conflicts:
	test-conflicts.php
Merge branch 'develop' (merge committ, not fast-forward)