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

Conflicts:
	application/bootstrap.php
	application/config/database.php
Merge branch 'master' of https://github.com/goper/abc.loc