commit damn you!
Merge branch 'master' of https://github.com/webengi/site

Conflicts:
	controllers/default.py.bak
	databases/storage.sqlite
	progress.log
	sessions/127.0.0.1-9cc90530-f805-4b28-95f8-5b721d4d9547
	views/default/products.html.bak