Two test cases up and running
Testing fix of conflicts
Merge branch 'master' of https://github.com/mikeh77/mi-instrument

Conflicts:
	mi/platform/rsn/rsn_platform_driver.py