properties that need to be pushed on my end

Signed-off-by: Elmo Nazareno <elmonazareno@gmail.com>
Merge branch 'master' of https://github.com/ramesesinc/incubation

Conflicts:
	rameses-custom-impl/nbproject/build-impl.xml
	rameses-custom-impl/nbproject/genfiles.properties
	rameses-osiris3-core2/nbproject/build-impl.xml
	rameses-osiris3-core2/nbproject/genfiles.properties
	rameses-osiris3-core2/nbproject/project.properties
Merge branch 'master' of https://github.com/ramesesinc/incubation
added date functions
added some workarounds in ActiveWorkflowService for the notifier
Merge branch 'master' of https://github.com/ramesesinc/incubation