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

Conflicts:
	application/config/database.php
	application/views/index/docs/view_officehour.php
	application/views/index/docs/view_officevalidation.php
	application/views/index/docs/view_storevalidation.php
	application/views/index/docs/view_uradress.php
	media/css/built.min.css
	media/css/main.css
	media/css/widgets.css
	media/js/built.min.js