Merge branch 'master' into newwidgets
Merge branch 'newwidgets' of github.com:domogik/domoweb into newwidgets

Conflicts:
	domoweb/models.py