Merge develop into features

Conflicts:
	test1.php
Commit develop test1
Merge develop into features
Commit develop test1
Revert "Commit develop test1"

This reverts commit 5f958346c3e75906b865b266af228bf327b52904.
Commit features test2
Commit features test2