xxx
Merge branch 'master' of github.com:aiisahik/hueNEW

Conflicts:
	hueNEW/views.pyc