!
Merge branch 'master' of https://github.com/ptsankov/bellog

Conflicts:
	web/index.php