reorganize
Merge remote-tracking branch 'upstream/master' into test

Conflicts:
	java/src/com/liferay/nativity/mac/PluginControl.java
added documentation