jvm properties
Merge branch 'master' of https://github.com/nbauma109/r2d2

Conflicts:
	pom.xml
1.7 compatibility