resize gameview
merge with master