specifying absolute path to java and jps
specifying relative path to java and jps
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml