net_battle mode
Merge branch 'master' of https://github.com/woinck/DS15-dev