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

Conflicts:
	dbScripts/pg_sisoprega_I1.sql