1
stage commit of initial files
2nd commit
Merge branch 'master' into stage

Conflicts:
	TestFile.php
add connectors/browser to master