work in progress
Merge https://github.com/BarsWars/BarWarsAndroid