translations
fixes
cookie alert translate
project panel fix
project collab label fix
profile edit fixes
Merge branch 'origin/develop'

Conflicts:
	protected/controllers/TranslationController.php
	protected/messages/sl/app.php
	protected/messages/sl/msg.php
	protected/views/project/view.php
	protected/views/translation/index.php