New build version for nhibernate
Update nhibernate collections
Project rearrange
Merge with develop