1
Merge branch 'master' of https://github.com/goper/phpnotes.loc

Conflicts:
	application/classes/appstrategy/appnamingstrategy.php
	application/classes/appstrategy/appstrategy.php
	application/classes/appstrategy/oldie.php
	application/classes/controller/base.php
	application/classes/controller/widgets/htmlwidget2.php
	application/classes/docs/blog.php
	application/views/admin/categories/add.php
	application/views/admin/categories/edit.php
	application/views/admin/docs/add.php
	application/views/admin/docs/edit.php
	application/views/admin/main/editsiteinfo.php
	application/views/admin/pages/add.php
	application/views/admin/pages/edit.php
	application/views/index/carcass.php
	application/views/index/comments/form.php
	application/views/index/contacts/view.php
	application/views/index/docs/index_blog1.php
	application/views/index/docs/view_blog1.php
	application/views/widgets/w_bestdocs.php
	media/css/style.css
	media/css/widgets.css