Finalised on 17Apr2014
Merge Fault 2

Conflicts:
	src/IndoorScene.cpp
	src/main.cpp