удалил composer.lock
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
Merge branch 'master' of github.com:vbabaev/zendblog
few template fixes
Merge branch 'master' of github.com:vbabaev/zendblog
xMerge branch 'master' of github.com:vbabaev/zendblog

Conflicts:
	module/Web/view/web/post/post.phtml