Commit#4
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/GUI_Task.suo