link.
link.
Merge branch 'develop' of git@github.com:ErythroME/Goo.git into develop

Conflicts:
	application/controllers/AdminCommonAction.php
	application/views/Public/Public/header.php