Ken v1
Merge branch 'Ken' into Eric

Conflicts:
	src/IndoorScene2.h