feature1 init
merge feature1
fix Game View scrollview bug