deleted:    db/domotik.db
	modified:   templates/index.html
	new file:   templates/js/jquery-ui.js
	modified:   templates/layout.html
Merge branch 'development' of https://github.com/kidrek/domotik into development