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

Conflicts:
	application/logs/log-2013-05-20.php
	application/logs/log-2013-05-21.php
	application/views/templates/news_archive.php
;lkjjoijmo
jnkjhnlnjh
;kkjmipo
Merge https://github.com/esenge/agnese

Conflicts:
	application/controllers/admin/article.php
	application/logs/log-2013-05-21.php
	application/logs/log-2013-05-23.php