pulling changes from recent
Merge branch 'master' of github.com:CorpusCallosum/EphemeralArchitecture

Conflicts:
	lanscapesC_kinect/src/lanscapes.cpp