synching from strathmore computer
Merge branch 'master' of github.com:CorpusCallosum/EphemeralArchitecture

Conflicts:
	lanscapesC_kinect/bin/data/settings.xml
	lanscapesC_kinect/src/lanscapes.cpp