Added nHibernate, as well as framework for services and api.
Fixed merge conflicts