Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev

Conflicts:
	UI/SISOPREGA_USA/WebContent/source/sisoprega.us.js
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev