Merge branch 'master' into 1.6

Conflicts:
	Acl/Controller/Component/Auth/AclCachedAuthorize.php
Redirect and notify when user is already logged in
With a submodule, .git will be a symlink

Thus, try the parent directory to detect croogo version from git