some changes
Merge branch 'master' of https://github.com/PowerCraft/API

Conflicts:
	powercraft/api/gres/nodesys/PC_GresNodesysHelper.java