Use more C++ features.
Merge branch 'master' into UnstableFeedback

Conflicts:
	Feedback360/Feedback360.cpp