energy line..and images

Signed-off-by: Mchapuis <machapu@gmail.com>
Merge branch 'master' of https://github.com/Mchapuis/ChromatoseGit into Mchapuis-master

Conflicts:
	Chromatose/Assets/ChromAssets/Art/Animations/spranim_ing.prefab