init app
Merge branch 'master' of https://github.com/masiqi/raspberry_home

Conflicts:
	web/manage.py
	web/web/settings.py
	web/web/urls.py