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

Conflicts:
	UI/SISOPREGA/WebContent/source/catalogs.commonButtons.js