Battle city c++
Merge branch 'origin/546'