master merged with minor issues and hibernate upgrade