Manual merge
Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD

Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp