inicjalizacja repo
ckeditor upgrade, kcfinder new
resztki
modul users
proba merge
Merge remote-tracking branch 'remotes/origin/master' into Prawidlowy

Conflicts:
	apps/administrator/module/Article/i18n/en_EN.php
	apps/administrator/module/Article/i18n/pl_PL.php
	apps/administrator/module/Article/templates/listShow.php
	apps/administrator/module/Article/templates/listShow_metro.php
	apps/administrator/module/Article/templates/listShow_metro_1.php
	apps/administrator/module/Article/templates/newfile
	apps/administrator/module/ArticleCategory/i18n/en_EN.php
	apps/administrator/module/ArticleCategory/i18n/pl_PL.php
	apps/administrator/module/ArticleCategory/templates/listShow.php
	apps/administrator/module/ArticleCategory/templates/listShow_metro.php
	apps/administrator/module/Gallery/i18n/en_EN.php
	apps/administrator/module/Gallery/i18n/pl_PL.php
	apps/administrator/module/Gallery/templates/listShow.php
	apps/administrator/module/Gallery/templates/listShow_metro.php
	apps/administrator/module/Index/templates/listShow_metro.php
	apps/administrator/module/Konfiguracja/i18n/en_EN.php
	apps/administrator/module/Konfiguracja/i18n/pl_PL.php
	apps/administrator/module/Konfiguracja/templates/listShow.php
	apps/administrator/module/Konfiguracja/templates/listShow_metro.php
	apps/administrator/module/Menu/i18n/en_EN.php
	apps/administrator/module/Menu/i18n/pl_PL.php
	apps/administrator/module/Menu/templates/assets/nestable/functions.js
	apps/administrator/module/Menu/templates/assets/nestable/style_nestable.css
	apps/administrator/module/Menu/templates/listShow.php
	apps/administrator/module/Menu/templates/listShow_metro.php
	apps/administrator/module/Menu/templates/listShow_metro_1.php
	apps/administrator/module/Menu/templates/script.php
	apps/administrator/module/Menu/templates/viewNestable/menuViewnestableHeader.php
	apps/administrator/module/Menu/templates/viewNestable/menuViewnestableParents.php
	apps/administrator/module/Panels/i18n/en_EN.php
	apps/administrator/module/Panels/i18n/pl_PL.php
	apps/administrator/module/Panels/templates/listShow.php
	apps/administrator/module/Panels/templates/listShow_metro.php
	apps/administrator/module/Panels/templates/listShow_metro_1.php
	apps/administrator/module/Plugins/i18n/en_EN.php
	apps/administrator/module/Plugins/i18n/pl_PL.php
	apps/administrator/module/Plugins/templates/listShow.php
	apps/administrator/module/Plugins/templates/listShow_metro.php
	apps/administrator/module/home/actions/home_actions.php
	apps/administrator/module/users/actions/users_actions.php
	apps/administrator/module/users/templates/listShow_metro.php
	apps/index/module/galeria/actions/galeria_actions.php
	apps/index/module/galeria/templates/galeriaShow.php
	apps/index/module/galeria/templates/galeriaTilesShow_metro.php
	apps/system/module/konfiguracja/actions/konfiguracjaBuildForms.php
	apps/system/module/konfiguracja/actions/konfiguracja_actions.php
	apps/system/module/konfiguracja/forms/konfiguracjaForm.php
	apps/system/module/menucategories/actions/menucategories_actions.php
	apps/system/module/panels/actions/panels_actions.php
	core/template.class.php
	helpers/assets_helper.php
	helpers/paths_helper.php
	model/aclusers/class/AclUsers.model.php
	model/aclusers/form/AclUsersForm_metro.php
	model/article/form/ArticleForm_metro.php
	model/gallery/class/Gallery.model.php
	model/gallery/form/GalleryForm_metro.php
	model/menutype/form/PanelsForm.php
	model/plugins/form/PluginForm_metro.php
	plugins/ckeditor/ckeditor.plugin.php
	public_html/assets/ckeditor/adapters/jquery.js
	public_html/assets/ckeditor/ckeditor.js
	public_html/assets/ckeditor/config.js
	public_html/assets/ckeditor/contents.css
	public_html/assets/ckeditor/lang/af.js
	public_html/assets/ckeditor/lang/ar.js
	public_html/assets/ckeditor/lang/bg.js
	public_html/assets/ckeditor/lang/bn.js
	public_html/assets/ckeditor/lang/bs.js
	public_html/assets/ckeditor/lang/ca.js
	public_html/assets/ckeditor/lang/cs.js
	public_html/assets/ckeditor/lang/cy.js
	public_html/assets/ckeditor/lang/da.js
	public_html/assets/ckeditor/lang/de.js
	public_html/assets/ckeditor/lang/el.js
	public_html/assets/ckeditor/lang/en-au.js
	public_html/assets/ckeditor/lang/en-ca.js
	public_html/assets/ckeditor/lang/en-gb.js
	public_html/assets/ckeditor/lang/en.js
	public_html/assets/ckeditor/lang/eo.js
	public_html/assets/ckeditor/lang/es.js
	public_html/assets/ckeditor/lang/et.js
	public_html/assets/ckeditor/lang/eu.js
	public_html/assets/ckeditor/lang/fa.js
	public_html/assets/ckeditor/lang/fi.js
	public_html/assets/ckeditor/lang/fo.js
	public_html/assets/ckeditor/lang/fr-ca.js
	public_html/assets/ckeditor/lang/fr.js
	public_html/assets/ckeditor/lang/gl.js
	public_html/assets/ckeditor/lang/gu.js
	public_html/assets/ckeditor/lang/he.js
	public_html/assets/ckeditor/lang/hi.js
	public_html/assets/ckeditor/lang/hr.js
	public_html/assets/ckeditor/lang/hu.js
	public_html/assets/ckeditor/lang/is.js
	public_html/assets/ckeditor/lang/it.js
	public_html/assets/ckeditor/lang/ja.js
	public_html/assets/ckeditor/lang/ka.js
	public_html/assets/ckeditor/lang/km.js
	public_html/assets/ckeditor/lang/ko.js
	public_html/assets/ckeditor/lang/lt.js
	public_html/assets/ckeditor/lang/lv.js
	public_html/assets/ckeditor/lang/mn.js
	public_html/assets/ckeditor/lang/ms.js
	public_html/assets/ckeditor/lang/nb.js
	public_html/assets/ckeditor/lang/nl.js
	public_html/assets/ckeditor/lang/no.js
	public_html/assets/ckeditor/lang/pl.js
	public_html/assets/ckeditor/lang/pt-br.js
	public_html/assets/ckeditor/lang/pt.js
	public_html/assets/ckeditor/lang/ro.js
	public_html/assets/ckeditor/lang/ru.js
	public_html/assets/ckeditor/lang/sk.js
	public_html/assets/ckeditor/lang/sl.js
	public_html/assets/ckeditor/lang/sr-latn.js
	public_html/assets/ckeditor/lang/sr.js
	public_html/assets/ckeditor/lang/sv.js
	public_html/assets/ckeditor/lang/th.js
	public_html/assets/ckeditor/lang/tr.js
	public_html/assets/ckeditor/lang/uk.js
	public_html/assets/ckeditor/lang/vi.js
	public_html/assets/ckeditor/lang/zh-cn.js
	public_html/assets/ckeditor/lang/zh.js
	public_html/assets/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
	public_html/assets/ckeditor/plugins/about/dialogs/about.js
	public_html/assets/ckeditor/plugins/about/dialogs/logo_ckeditor.png
	public_html/assets/ckeditor/plugins/clipboard/dialogs/paste.js
	public_html/assets/ckeditor/plugins/colordialog/dialogs/colordialog.js
	public_html/assets/ckeditor/plugins/dialog/dialogDefinition.js
	public_html/assets/ckeditor/plugins/div/dialogs/div.js
	public_html/assets/ckeditor/plugins/find/dialogs/find.js
	public_html/assets/ckeditor/plugins/flash/dialogs/flash.js
	public_html/assets/ckeditor/plugins/forms/dialogs/button.js
	public_html/assets/ckeditor/plugins/forms/dialogs/checkbox.js
	public_html/assets/ckeditor/plugins/forms/dialogs/form.js
	public_html/assets/ckeditor/plugins/forms/dialogs/hiddenfield.js
	public_html/assets/ckeditor/plugins/forms/dialogs/radio.js
	public_html/assets/ckeditor/plugins/forms/dialogs/select.js
	public_html/assets/ckeditor/plugins/forms/dialogs/textarea.js
	public_html/assets/ckeditor/plugins/forms/dialogs/textfield.js
	public_html/assets/ckeditor/plugins/iframe/dialogs/iframe.js
	public_html/assets/ckeditor/plugins/image/dialogs/image.js
	public_html/assets/ckeditor/plugins/link/dialogs/anchor.js
	public_html/assets/ckeditor/plugins/link/dialogs/link.js
	public_html/assets/ckeditor/plugins/liststyle/dialogs/liststyle.js
	public_html/assets/ckeditor/plugins/pastefromword/filter/default.js
	public_html/assets/ckeditor/plugins/scayt/dialogs/options.js
	public_html/assets/ckeditor/plugins/scayt/dialogs/toolbar.css
	public_html/assets/ckeditor/plugins/smiley/dialogs/smiley.js
	public_html/assets/ckeditor/plugins/specialchar/dialogs/specialchar.js
	public_html/assets/ckeditor/plugins/table/dialogs/table.js
	public_html/assets/ckeditor/plugins/tabletools/dialogs/tableCell.js
	public_html/assets/ckeditor/plugins/templates/dialogs/templates.js
	public_html/assets/ckeditor/plugins/templates/templates/default.js
	public_html/assets/ckeditor/plugins/wsc/dialogs/ciframe.html
	public_html/assets/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
	public_html/assets/ckeditor/plugins/wsc/dialogs/wsc.css
	public_html/assets/ckeditor/plugins/wsc/dialogs/wsc.js
	public_html/templates/satserwis/config.ini
	public_html/templates/satserwis/css/flexslider.css
	public_html/templates/satserwis/css/menu.css
	public_html/templates/satserwis/css/satserwis.css
	public_html/templates/satserwis/index.phtml
	public_html/templates/satserwis/js/jquery-hover-effect.js
	public_html/templates/satserwis/js/jquery.custom.js
	public_html/templates/satserwis/portfolio.html
	public_html/templates/satserwis/subtemplate.phtml
	ztemp/klcms.sql
usunalem stara wersje ckeditor i ckfinder
dodalem nowa wersje ckeditor
porawiono błędy po merged
porawiono błędy po merged
sprzątanie po merged