sqlite
Merge branch 'master' of https://github.com/egorovpavel/web

Conflicts:
	package.json