further fixing of code
Merge branch 'master' of https://github.com/cheinrich09/Lua-Project

Conflicts:
	Lua_Example/Lua_Example/Core/ModelLoader.cpp
	Lua_Example/Lua_Example/Core/ModelLoader.h