luzes
interface
Merge branch 'master' of https://github.com/ZPaulo/LAIG

Conflicts:
	ANFScene.cpp
	ANFScene.h