commited.
conflict occured
conflict solved
i wanna no conflicted heaven
bug caught
Merge remote-tracking branch 'origin/KTHWorking' into develop

Conflicts:
	src/kr/re/ec/zigeon/util/ScaleImageView.java