impl jvm
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/jivesoftware/intellij/tech/commands/JCommandType.java