At last
Merge branch 'master' of https://github.com/jpleitao/projecto-cg

Conflicts:
	ObjectManager.cxx