..
Merge branch 'origin' of https://github.com/esenge/agnese

Conflicts:
	application/controllers/admin/article.php