working on dynamic texture creation
Merge branch 'master' of https://github.com/thaithco/tconstruct-armor

Conflicts:
	src/trunkzilla/tcarmor/TCARepo.java
Merge branch 'master' of https://github.com/thaithco/tconstruct-armor

Conflicts:
	src/trunkzilla/tcarmor/TCARepo.java