shared updates
Merge branch 'master' of https://github.com/ramesesinc/shared

Conflicts:
	client/rameses-client-menu/src/META-INF/xfolders.xml