Change models to use json

Conflicts:
	models/tanks/cannon.json
Merge branch 'master' of github.com:pithyless/battle_tank