Upgraded rx
Dependency upgrades

Conflicts:
	parent/pom.xml