Made name obligatory for Geometries since we need to have unique names in our list
Merged stuff
Fixed merge bugs
Merge branch 'master' of https://github.com/happah-graphics/happah.git

Conflicts:
	happah.pro
	src/main/core/geometries/InvoluteSpurGear.cpp
	src/main/core/geometries/InvoluteSpurGear.h
	src/main/core/geometries/Sphere.cpp
	src/main/core/geometries/Sphere.h
	src/main/core/geometries/TriPatch.cpp
	src/main/core/geometries/TriPatch.h
	src/main/core/models/Drawable.cpp
Merge branch 'master' of https://github.com/happah-graphics/happah.git
Removed 410 shader loading and corrected involuteSpearGear parameters
Commented out problematic warning in InvoluteSpearGear