fixed resize issue
Merge remote-tracking branch 'origin/dragon-fusion' into dragon-fusion

Conflicts:
	js/main.js