Merge branch 'master' of https://github.com/frogpad7/HueGitHub

Conflicts:
	Hue New/Library/CurrentLayout.dwlt
	Hue New/Library/assetDatabase3
Merge branch 'master' of https://github.com/frogpad7/HueGitHub