Scenes
Merge branch 'master' of https://github.com/HalfdanJ/Obscura-RF2013

# By Jonas Jongejan
# Via Jonas Jongejan
* 'master' of https://github.com/HalfdanJ/Obscura-RF2013:
  triangle is now a class
  Triangles og en masse små forbedringer

Conflicts:
	Gloria/Gloria.xcodeproj/project.pbxproj
	Gloria/src/ContentScene.h
	Gloria/src/testApp.cpp
	Gloria/src/testApp.h