Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assets/Standard Assets/GUI/GUIElements/GUISkin.guiskin
	RobotSpaceMiner/RobotSpaceMiner-csharp.v11.suo