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

Conflicts:
	application/logs/log-2013-05-23.php
	application/views/_main_layout.php