Merge branch 'master' of https://github.com/mwarrington/ADayInTheLife

Conflicts:
	ADayInTheLife/ADayInTheLife-csharp.sln
	ADayInTheLife/ADayInTheLife.sln