test update
Merge branch 'feature/umbraco' of https://github.com/mikeedwards83/Glass.Mapper into feature/umbraco

Conflicts:
	Tests/Integration Tests/Umbraco/Glass.Mapper.Umb.Integration/Configuration/Fluent/FluentGeneralFixture.cs