major updates
Merge branch 'master' of https://github.com/xrabohrok/SFML-componantFramework

Conflicts:
	SFML_start/AnimDrawable.cpp
	SFML_start/AnimDrawable.h
	SFML_start/Animation.cpp
	SFML_start/Entity.cpp
	SFML_start/Entity.h