2.0

Merge branch 'master' of git://github.com/masev/MasevSettingsBundle

Conflicts:
	ezpublish_legacy/masev_settings/design/standard/templates/configuration/index.tpl