Fixed line separators and encodings
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/bootstrap.php
	admin/views/automailing/automailing.js
	admin/views/automailing/tmpl/default.php
	admin/views/automailing/tmpl/edit.php
	admin/views/automailingitem/automailingitem.js
	admin/views/automailingitem/tmpl/default.php
	admin/views/automailings/tmpl/default.php
	admin/views/configuration/tmpl/config_advanced.php
	admin/views/configuration/tmpl/default.php
	admin/views/dashboard/tmpl/default.php
	admin/views/dashboard/tmpl/handlers.php
	admin/views/dashboard/tmpl/news.php
	admin/views/dashboard/tmpl/static.php
	admin/views/dashboard/tmpl/updater.php
	admin/views/extension/tmpl/default.php
	admin/views/extension/tmpl/edit.php
	admin/views/import/tmpl/default.php
	admin/views/list/tmpl/advanced.php
	admin/views/list/tmpl/default.php
	admin/views/list/tmpl/exclude.php
	admin/views/list/tmpl/import.php
	admin/views/list/tmpl/overview.php
	admin/views/list/tmpl/unsubscribed.php
	admin/views/listevent/listevent.js
	admin/views/listevent/tmpl/default.php
	admin/views/mailboxprofile/tmpl/default.php
	admin/views/maintainance/tmpl/default.php
	admin/views/newsletter/tmpl/attachments.php
	admin/views/newsletter/tmpl/default.php
	admin/views/newsletter/tmpl/html.php
	admin/views/newsletter/tmpl/plain.php
	admin/views/newsletter/tmpl/preview.php
	admin/views/newsletters/tmpl/default.php
	admin/views/plugin/tmpl/listimport-beforeexecrule.php
	admin/views/plugin/tmpl/listimport-execrule.php
	admin/views/plugin/tmpl/listimport-showrule.php
	admin/views/plugin/tmpl/listimport-showrules.php
	admin/views/sender/tmpl/default.php
	admin/views/sender/tmpl/default_newsletters.php
	admin/views/smtpprofile/tmpl/default.php
	admin/views/statistic/tmpl/default.php
	admin/views/statistic/tmpl/default_clicks.php
	admin/views/subscriber/tmpl/default.php
	admin/views/subscriber/tmpl/edit.php
	admin/views/subscriber/tmpl/edit_subscriber.php
	admin/views/subscribers/tmpl/default.php
	admin/views/template/tmpl/default.php
	admin/views/template/tmpl/edit.php
	admin/views/templates/tmpl/default.php
	admin/views/test/tmpl/default.php
	admin/views/uninstall/tmpl/default.php
	admin/views/updater/tmpl/default.php
	build.xml
	extensions/libraries/migur/library/model.php
	extensions/libraries/migur/library/view.php
	extensions/modules/mod_newsletter_subscribe/scripts/subscribe.js
	media/css/admin.css
	media/css/automailing.css
	media/css/automailingitem.css
	media/css/automailings.css
	media/css/configuration.css
	media/css/dashboard.css
	media/css/extension.css
	media/css/import.css
	media/css/list.css
	media/css/mailboxprofile.css
	media/css/newsletter.css
	media/css/newsletters.css
	media/css/sender.css
	media/css/smtpprofile.css
	media/css/statistic.css
	media/css/subscribers.css
	media/css/templates.css
	media/js/migur/js/ajax.js
	media/js/migur/js/core.js
	newsletter.xml
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/views/configuration/tmpl/default.php
	admin/views/list/tmpl/advanced.php
	admin/views/list/tmpl/exclude.php
	admin/views/list/tmpl/import.php
	admin/views/list/tmpl/overview.php
	admin/views/subscriber/tmpl/edit.php
	admin/views/uninstall/tmpl/default.php
	build.xml
	newsletter.xml
Merge branch 'dev/j3/common' into dev/j3/free

Conflicts:
	build.xml
Merge branch 'dev/j3/common' into 'dev/j3/free'