integrating screens in progress
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev
-It was changed for each to normal fors
-Integrating views in progress
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev

Conflicts:
	UI/SISOPREGA_USA/WebContent/depends.js