Syncing up files

From PC
Merge branch 'master' of https://github.com/CarlosGutierrez/CarlosEngine

Conflicts:
	CarlosEngine/Application.cpp
	CarlosEngine/Application.h
	CarlosEngine/ThesisActor.cpp
	CarlosEngine/ThesisGame.cpp
	CarlosEngine/ThesisPlayer.cpp