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
	media/uploads/docs/4fa24e25c66701585450d614fa36a31b.png
	media/uploads/docs/bc70a0a51a9b94bee2f10b9f3ad33977.png
	media/uploads/docs/small_4fa24e25c66701585450d614fa36a31b.png
	media/uploads/docs/small_bc70a0a51a9b94bee2f10b9f3ad33977.png
Merge branch 'master' of https://github.com/goper/abc.loc