Merge branch 'develop' of C:\web\sites\github1 with conflicts.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test2.php
Merge remote-tracking branch 'origin/develop' into develop
New changelist