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

Conflicts:
	UI/SISOPREGA/WebContent/source/reports.main.js
Fixing simple message
Merge branch 'master' of https://github.com/diego-torres/SISOPREGA
Merge branch 'ws_dev' of https://github.com/diego-torres/SISOPREGA into ws_dev