Merge branch 'master' of git://github.com/namvuonghcm/kibowsite

Conflicts:
	application/Bootstrap.php
	application/modules/cp/controllers/IndexController.php
	application/modules/default/forms/Addpost.php
	public/index.php