modified:   utils/web.py
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
Merge branch 'development' of https://github.com/kidrek/domotik into development
	modified:   utils/db_initialise.py