Edits to FMX tests
Merge branch 'master' of https://github.com/ProtoTest/Golem

Conflicts:
	Emcon.FMXTests/App.config
	Golem.v11.suo