Fixing issue directly on master
Merge branch 'development'

Conflicts:
	ConsoleTest/Program.cs
Merge branch 'development' of https://github.com/andy-g/FundTest
Critical change to some copy
Merge branch 'hotfix#1' into development