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

Conflicts:
	application/classes/controller/base.php
	application/views/index/docs/index_cat.php
	application/views/index/docs/view_cat.php
	application/views/widgets/w_slider.php
	media/css/style.css