Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Fixed package references to force using NHibernate [3.3.2.4000]
Merge branch 'dev'
Merge branch 'master' into dev