test
test2
deps
local
Merge remote-tracking branch 'origin/master'

Conflicts:
	.buildpath
	.gitignore
	.project
	app/Resources/views/backend.html.twig
	app/Resources/views/jsVarString.html.twig
	app/Resources/views/message.html.twig
	app/Resources/views/notification.html.twig
	app/Resources/views/notifications.html.twig
	app/Resources/views/singleframe.html.twig
	app/bootstrap.php.cache
	deps
	src/Core/EssentialsBundle/Resources/views/Backend/login.html.twig
	src/Core/EssentialsBundle/Resources/views/Default/backend.html.twig
	src/Core/EssentialsBundle/Resources/views/Default/users.html.twig
	src/Core/EssentialsBundle/Resources/views/Ui/alertDialog.html.twig
	src/Core/EssentialsBundle/Resources/views/Users/add.html.twig
	src/Core/EssentialsBundle/Resources/views/Users/edit.html.twig
	src/Core/EssentialsBundle/Resources/views/Users/overview.html.twig
	src/Core/EssentialsBundle/TranslatableManager.php
	src/Core/MediaBundle/Entity/FileGroup.php
	src/Core/MediaBundle/Resources/views/Backend/index.html.twig
	src/Core/MediaBundle/Resources/views/Backend/upload.html.twig
	src/Core/MediaBundle/Resources/views/Widget/image.html.twig
	src/Core/MediaBundle/WidgetGuesser.php
	src/Core/PagesBundle/Resources/views/Backend/addCategory.html.twig
	src/Core/PagesBundle/Resources/views/Backend/categoryTree.html.twig
	src/Core/PagesBundle/Resources/views/Backend/getUiTranslations.html.twig
	src/Core/PagesBundle/Resources/views/Backend/overview.html.twig
	src/Core/PagesBundle/Resources/views/Backend/translationsTable.html.twig
	src/Core/PagesBundle/Resources/views/Backend/updatePage.html.twig
	src/Core/PagesBundle/Resources/views/Backend/updatePageCatTranslation.html.twig
	src/Core/PagesBundle/Resources/views/Backend/updatePageCategory.html.twig
	src/Core/PagesBundle/Resources/views/Backend/updateTranslation.html.twig
	src/Core/PostsBundle/Controller/DefaultController.php
	src/Core/PostsBundle/Entity/Post.php
	web/css/990288b.css
	web/css/style.css
	web/js/tiny_mce/license.txt
	web/js/tiny_mce/plugins/advhr/css/advhr.css
	web/js/tiny_mce/plugins/advhr/editor_plugin_src.js
	web/js/tiny_mce/plugins/advhr/js/rule.js
	web/js/tiny_mce/plugins/advhr/rule.htm
	web/js/tiny_mce/plugins/advimage/css/advimage.css
	web/js/tiny_mce/plugins/advimage/editor_plugin_src.js
	web/js/tiny_mce/plugins/advimage/image.htm
	web/js/tiny_mce/plugins/advimage/js/image.js
	web/js/tiny_mce/plugins/advlink/css/advlink.css
	web/js/tiny_mce/plugins/advlink/editor_plugin_src.js
	web/js/tiny_mce/plugins/advlink/js/advlink.js
	web/js/tiny_mce/plugins/advlink/link.htm
	web/js/tiny_mce/plugins/advlist/editor_plugin_src.js
	web/js/tiny_mce/plugins/autosave/editor_plugin_src.js
	web/js/tiny_mce/plugins/autosave/langs/en.js
	web/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
	web/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
	web/js/tiny_mce/plugins/directionality/editor_plugin_src.js
	web/js/tiny_mce/plugins/emotions/editor_plugin_src.js
	web/js/tiny_mce/plugins/emotions/emotions.htm
	web/js/tiny_mce/plugins/emotions/js/emotions.js
	web/js/tiny_mce/plugins/example/dialog.htm
	web/js/tiny_mce/plugins/example/editor_plugin_src.js
	web/js/tiny_mce/plugins/example/js/dialog.js
	web/js/tiny_mce/plugins/example/langs/en.js
	web/js/tiny_mce/plugins/example/langs/en_dlg.js
	web/js/tiny_mce/plugins/fullpage/css/fullpage.css
	web/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
	web/js/tiny_mce/plugins/fullpage/fullpage.htm
	web/js/tiny_mce/plugins/fullpage/js/fullpage.js
	web/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
	web/js/tiny_mce/plugins/fullscreen/fullscreen.htm
	web/js/tiny_mce/plugins/iespell/editor_plugin_src.js
	web/js/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
	web/js/tiny_mce/plugins/inlinepopups/template.htm
	web/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
	web/js/tiny_mce/plugins/layer/editor_plugin_src.js
	web/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
	web/js/tiny_mce/plugins/media/css/media.css
	web/js/tiny_mce/plugins/media/editor_plugin_src.js
	web/js/tiny_mce/plugins/media/js/embed.js
	web/js/tiny_mce/plugins/media/js/media.js
	web/js/tiny_mce/plugins/media/media.htm
	web/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
	web/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
	web/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
	web/js/tiny_mce/plugins/paste/editor_plugin_src.js
	web/js/tiny_mce/plugins/paste/js/pastetext.js
	web/js/tiny_mce/plugins/paste/js/pasteword.js
	web/js/tiny_mce/plugins/paste/pastetext.htm
	web/js/tiny_mce/plugins/paste/pasteword.htm
	web/js/tiny_mce/plugins/preview/example.html
	web/js/tiny_mce/plugins/preview/jscripts/embed.js
	web/js/tiny_mce/plugins/preview/preview.html
	web/js/tiny_mce/plugins/print/editor_plugin_src.js
	web/js/tiny_mce/plugins/save/editor_plugin_src.js
	web/js/tiny_mce/plugins/searchreplace/css/searchreplace.css
	web/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
	web/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
	web/js/tiny_mce/plugins/searchreplace/searchreplace.htm
	web/js/tiny_mce/plugins/spellchecker/css/content.css
	web/js/tiny_mce/plugins/spellchecker/editor_plugin_src.js
	web/js/tiny_mce/plugins/style/css/props.css
	web/js/tiny_mce/plugins/style/editor_plugin_src.js
	web/js/tiny_mce/plugins/style/js/props.js
	web/js/tiny_mce/plugins/table/cell.htm
	web/js/tiny_mce/plugins/table/css/cell.css
	web/js/tiny_mce/plugins/table/css/row.css
	web/js/tiny_mce/plugins/table/css/table.css
	web/js/tiny_mce/plugins/table/js/cell.js
	web/js/tiny_mce/plugins/table/js/merge_cells.js
	web/js/tiny_mce/plugins/table/js/row.js
	web/js/tiny_mce/plugins/table/js/table.js
	web/js/tiny_mce/plugins/table/merge_cells.htm
	web/js/tiny_mce/plugins/table/row.htm
	web/js/tiny_mce/plugins/table/table.htm
	web/js/tiny_mce/plugins/template/blank.htm
	web/js/tiny_mce/plugins/template/css/template.css
	web/js/tiny_mce/plugins/template/editor_plugin_src.js
	web/js/tiny_mce/plugins/template/js/template.js
	web/js/tiny_mce/plugins/template/template.htm
	web/js/tiny_mce/plugins/visualblocks/css/visualblocks.css
	web/js/tiny_mce/plugins/visualblocks/editor_plugin_src.js
	web/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
	web/js/tiny_mce/plugins/wordcount/editor_plugin_src.js
	web/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
	web/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
	web/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
	web/js/tiny_mce/plugins/xhtmlxtras/cite.htm
	web/js/tiny_mce/plugins/xhtmlxtras/css/attributes.css
	web/js/tiny_mce/plugins/xhtmlxtras/css/popup.css
	web/js/tiny_mce/plugins/xhtmlxtras/del.htm
	web/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
	web/js/tiny_mce/plugins/xhtmlxtras/ins.htm
	web/js/tiny_mce/plugins/xhtmlxtras/js/abbr.js
	web/js/tiny_mce/plugins/xhtmlxtras/js/acronym.js
	web/js/tiny_mce/plugins/xhtmlxtras/js/attributes.js
	web/js/tiny_mce/plugins/xhtmlxtras/js/cite.js
	web/js/tiny_mce/plugins/xhtmlxtras/js/del.js
	web/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
	web/js/tiny_mce/plugins/xhtmlxtras/js/ins.js
	web/js/tiny_mce/themes/advanced/about.htm
	web/js/tiny_mce/themes/advanced/anchor.htm
	web/js/tiny_mce/themes/advanced/charmap.htm
	web/js/tiny_mce/themes/advanced/color_picker.htm
	web/js/tiny_mce/themes/advanced/editor_template_src.js
	web/js/tiny_mce/themes/advanced/image.htm
	web/js/tiny_mce/themes/advanced/js/about.js
	web/js/tiny_mce/themes/advanced/js/anchor.js
	web/js/tiny_mce/themes/advanced/js/charmap.js
	web/js/tiny_mce/themes/advanced/js/image.js
	web/js/tiny_mce/themes/advanced/js/link.js
	web/js/tiny_mce/themes/advanced/js/source_editor.js
	web/js/tiny_mce/themes/advanced/link.htm
	web/js/tiny_mce/themes/advanced/shortcuts.htm
	web/js/tiny_mce/themes/advanced/skins/default/content.css
	web/js/tiny_mce/themes/advanced/skins/default/dialog.css
	web/js/tiny_mce/themes/advanced/skins/default/ui.css
	web/js/tiny_mce/themes/advanced/skins/highcontrast/content.css
	web/js/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
	web/js/tiny_mce/themes/advanced/skins/highcontrast/ui.css
	web/js/tiny_mce/themes/advanced/skins/o2k7/content.css
	web/js/tiny_mce/themes/advanced/skins/o2k7/dialog.css
	web/js/tiny_mce/themes/advanced/skins/o2k7/ui.css
	web/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
	web/js/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
	web/js/tiny_mce/themes/advanced/source_editor.htm
	web/js/tiny_mce/themes/simple/editor_template_src.js
	web/js/tiny_mce/themes/simple/skins/default/content.css
	web/js/tiny_mce/themes/simple/skins/default/ui.css
	web/js/tiny_mce/themes/simple/skins/o2k7/content.css
	web/js/tiny_mce/themes/simple/skins/o2k7/ui.css
	web/js/tiny_mce/tiny_mce_src.js
	web/js/tiny_mce/utils/editable_selects.js
	web/js/tiny_mce/utils/form_utils.js
	web/js/tiny_mce/utils/mctabs.js
	web/js/tiny_mce/utils/validate.js
translateables