Working to make the scene appear

Scene class created.
Finished draw functions for the primitives (without textures and
normals).
Merge branch 'master' of https://github.com/vitormota/LAIG-2013-2014

Conflicts:
	include/Lightning.h
	src/Lightning.cpp
Commit to revert to the previous changes (Lightning class)