Merge branch 'master' of https://github.com/serebatos/smart_h

Conflicts:
	db.sqlite3
	h_ctrl/admin.pyc
	h_ctrl/models.py
	h_ctrl/models.pyc
Merge branch 'master' of https://github.com/serebatos/smart_h

Conflicts:
	db.sqlite3
	h_ctrl/admin.pyc
	h_ctrl/models.py
	h_ctrl/models.pyc
.gitignore