Merge origin/develop into develop
Message HTML fix
Invitations commented out
Registration and activation redone
Translation fixes
Translation fixes
Merge origin/develop into develop
Merge no-invite into develop

Conflicts:
	protected/messages/hr/app.php
	protected/messages/hr/msg.php
	protected/modules/user/controllers/RegistrationController.php
Translation fixes
Merge origin/develop into develop
Merge origin/develop into develop

Conflicts:
	images/logo-title.png
Logo fix
Merge origin/develop into develop