(re)added weapon model
Merge branch 'master' of github.com:danielpetroianu/TheBattle

* 'master' of github.com:danielpetroianu/TheBattle:
  updated army model to have a name
Merge branch 'master' of github.com:danielpetroianu/TheBattle

# By Florian Parvan
# Via Florian Parvan
* 'master' of github.com:danielpetroianu/TheBattle:
  populate control from the database example