new texture manager
Merge branch 'master' of github.com:renbing/battle

Conflicts:
	index.js