add atlases
merge done
yolo
add merge bails
merge cnsivh
we will do it
ANIMATIONS
Merge branch 'herzucco' of github.com:Kl0tl/gameweek2014 into kl0tl

Conflicts:
	index.html
	src/index.js
	src/nuclear_modules/game.ai/entities/skeleton-entity.js
	src/nuclear_modules/game.hero/entities/hero-entity.js
	src/systems-context.js
weapons animations