Upgraded to NHibernate v4
Fixed a few unit tests
Fixed a few more unit tests
Merge branch 'NH4_Upgrade' into release-5.0.0