Petit fix
Merge branch 'master' of https://github.com/k-team/g-home

Conflicts:
	core/fields/__init__.py
Merge branch 'master' of https://github.com/k-team/g-home