temp
Merge branch 'timeline_battle' of github.com:trarck/CCGE into timeline_battle

Conflicts:
	Classes/EntityComponent/EntityComponentFactory.cpp
	Classes/EntityComponent/EntityPropertyFactory.cpp