orm edited for allow transactions for ranchers, enterprise ranchers
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev

Conflicts:
	backEnd/CommonLib/src/com/tramex/sisoprega/dto/EnterpriseRancher.java