#47 metodo de obtenção de palavras e categorias @sofialimapinto @xiko @mmribeiro
Merge branch 'master' of https://github.com/qsp/engenius

Conflicts:
	SocialGameOpenGLApplication/GraphOpenGL.cpp