update
update
update
Merge branch 'master' of https://github.com/TheOctopod/NXsuite.git

Conflicts:
	src/main/java/com/octopod/nixium/nxsuite/build/PluginControl.java