First commit to test git
Merge branch 'master' of https://github.com/SWTI2014/SWTI2014-Project-12

Conflicts:
	packages/MorphicTestingFramework-Core.package/MTFDemo.class/instance/myMoney.st
	packages/MorphicTestingFramework-Core.package/MTFDemo.class/methodProperties.json
	packages/MorphicTestingFramework-Core.package/monticello.meta/version
resovled conflicts