Tested and Finalized.
Merge branch 'master' of https://github.com/SamTube405/GCom

Conflicts:
	nbproject/project.properties