RenderAssets & Weaknesses + Resistances
Merge branch 'master' of https://github.com/TuxCraft/TuxWeapons

Conflicts:
	TuxWeapons/TuxCraft/Assets.java