checkpoint
Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot

Conflicts:
	interface/src/AudioReflector.cpp
next cut