some fixes
recommitting what ozgur committed just to remove conflicts
merge conf
fix
Merge branch 'master' of https://github.com/Ragzzy-R/UntitledGameEngine

Conflicts:
	untitled Engine V0.2/include/FontRenderer.h
	untitled Engine V0.2/include/Images.h
	untitled Engine V0.2/sample/MenuState.cpp