Comment added
Merge remote-tracking branch 'origin/master'

Conflicts:
	CoreSkySystem/src/com/CoreSkySystem/Commands/COMMAND_gm.java
Test