Merge commit 'e326757d5f80311aeccb3b77ddb0032480105bfd' into new_skin_v2

Conflicts:
	e2/controllers/ActivityController.class.php
	e2/controllers/ArticleController.class.php
	e2/js/e2.js
	e2/models/Event/Event.class.php
	e2/models/Event/EventTravel.class.php
	e2/models/User/UserForm.class.php
	e2/views/article/article_form_admin.view.php
	e2/views/article/article_form_user.view.php
	e2/views/event/event_profile.view.php
	e2/views/event/event_report_form.view.php
	e2/views/event/event_travel_abstract.view.php