Small fix
Merge branch 'master' of ssh://synlos.net/esta

Conflicts:
	protected/messages/en/app.php