Merge origin/master

Conflicts:
	src/com/sevenseventwo/murray/commands/HotLightCommand.java