Merge remote-tracking branch 'origin/master' into feature/edit-repetitive-events
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
CAL-684 get previous occurrence of an occurrence
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
Use a dedicated maven-depmgt-pom for the FB
Merge branch 'master' into feature/edit-repetitive-events
Merge remote-tracking branch 'origin/master' into feature/edit-repetitive-events
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	pom.xml
PLF-5421 :Update version of kernel | core | jcr | ws | gatein to be compliant with plf-4.x(fix conflicts)
CAL-684 Edit repetitive events integration
CAL-684 fix NodeNotFoundException
SWF-2676 : Create edit-repetitive-events branch and update projects versions
CAL-684 date string only for stop repeating date
CAL-684 get previous occurrence of an occurrence
Merge branch 'feature/edit-repetitive-events' of github.com:exodev/integration into feature/edit-repetitive-events
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
PLF-5421 : Update version of kernel | core | jcr | ws | gatein to be compliant with plf-4.x (Fix JUNIT tests)
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
Merge remote-tracking branch 'origin/master' into feature/edit-repetitive-events
Merge remote-tracking branch 'origin/master' into feature/edit-repetitive-events