Test issues #1
Test issues #1
fixes #1
Merge origin/master

Conflicts:
	testproject/index.php