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

Conflicts:
	UI/SISOPREGA_USA/WebContent/source/admin.screen.js
	UI/SISOPREGA_USA/WebContent/source/cache.pen.js
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev