Merge branch 'ua-aveselov' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/grid/AdminActions.yml
	application/configs/grid/Admins.yml
	application/configs/i10n/ru.php
	data/cache/api/.gitignore
	data/cache/config/.gitignore
	data/cache/meta/.gitignore
	data/cache/translate/.gitignore
	data/logs/translate/.gitignore
	data/smarty_compile/.gitignore
	data/updater/.gitignore
	library/Core/Grid/Html/Abstract.php
	library/Core/Grid/Source/Abstract.php
	library/Core/Grid/Source/Doctrine2.php
	library/Core/Grid/Source/Doctrine2QueryBuilder.php
Добавил файлы, которые какого-то хрена не стали на версию
Merge branch 'ua-aveselov' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/modules/admin/controllers/ApiController.php
	application/modules/admin/controllers/IndexController.php
	application/modules/admin/views/templates/index/index.tpl
Merge branch 'ua-aveselov' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/modules/admin/controllers/ApiController.php
	application/modules/admin/controllers/IndexController.php
	application/modules/admin/views/templates/index/index.tpl
Merge branch 'ua-aveselov' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/modules/admin/controllers/ApiController.php
	application/modules/admin/controllers/IndexController.php
	application/modules/admin/views/templates/index/index.tpl
Merge remote-tracking branch 'origin/ua-pmatvienko' into ua-dsemik

Conflicts:
	application/configs/i10n/ru.php
	application/layouts/scripts/admin.tpl
	application/modules/admin/controllers/IndexController.php
	library/Core/Grid/Modifier/Ip.php
	public_html/res/pnotify/oxygen/16/actions/acrobat.png
	public_html/res/pnotify/oxygen/16/actions/address-book-new.png
	public_html/res/pnotify/oxygen/16/actions/application-exit.png
	public_html/res/pnotify/oxygen/16/actions/appointment-new.png
	public_html/res/pnotify/oxygen/16/actions/archive-extract.png
	public_html/res/pnotify/oxygen/16/actions/archive-insert-directory.png
	public_html/res/pnotify/oxygen/16/actions/archive-insert.png
	public_html/res/pnotify/oxygen/16/actions/archive-remove.png
	public_html/res/pnotify/oxygen/16/actions/arrow-down-double.png
	public_html/res/pnotify/oxygen/16/actions/arrow-down.png
	public_html/res/pnotify/oxygen/16/actions/arrow-left-double.png
	public_html/res/pnotify/oxygen/16/actions/arrow-left.png
	public_html/res/pnotify/oxygen/16/actions/arrow-right-double.png
	public_html/res/pnotify/oxygen/16/actions/arrow-right.png
	public_html/res/pnotify/oxygen/16/actions/arrow-up-double.png
	public_html/res/pnotify/oxygen/16/actions/arrow-up.png
	public_html/res/pnotify/oxygen/16/actions/bookmark-new-list.png
	public_html/res/pnotify/oxygen/16/actions/bookmark-new.png
	public_html/res/pnotify/oxygen/16/actions/bookmark-toolbar.png
	public_html/res/pnotify/oxygen/16/actions/bookmarks-organize.png
	public_html/res/pnotify/oxygen/16/actions/character-set.png
	public_html/res/pnotify/oxygen/16/actions/checkbox.png
	public_html/res/pnotify/oxygen/16/actions/chronometer.png
	public_html/res/pnotify/oxygen/16/actions/color-picker-black.png
	public_html/res/pnotify/oxygen/16/actions/color-picker-grey.png
	public_html/res/pnotify/oxygen/16/actions/color-picker-white.png
	public_html/res/pnotify/oxygen/16/actions/color-picker.png
	public_html/res/pnotify/oxygen/16/actions/configure-shortcuts.png
	public_html/res/pnotify/oxygen/16/actions/configure-toolbars.png
	public_html/res/pnotify/oxygen/16/actions/configure.png
	public_html/res/pnotify/oxygen/16/actions/contact-new.png
	public_html/res/pnotify/oxygen/16/actions/dashboard-show.png
	public_html/res/pnotify/oxygen/16/actions/dialog-cancel.png
	public_html/res/pnotify/oxygen/16/actions/dialog-close.png
	public_html/res/pnotify/oxygen/16/actions/dialog-ok-apply.png
	public_html/res/pnotify/oxygen/16/actions/dialog-ok.png
	public_html/res/pnotify/oxygen/16/actions/document-close.png
	public_html/res/pnotify/oxygen/16/actions/document-decrypt.png
	public_html/res/pnotify/oxygen/16/actions/document-edit-decrypt-verify.png
	public_html/res/pnotify/oxygen/16/actions/document-edit-decrypt.png
	public_html/res/pnotify/oxygen/16/actions/document-edit-encrypt.png
	public_html/res/pnotify/oxygen/16/actions/document-edit-sign-encrypt.png
	public_html/res/pnotify/oxygen/16/actions/document-edit-sign.png
	public_html/res/pnotify/oxygen/16/actions/document-edit-verify.png
	public_html/res/pnotify/oxygen/16/actions/document-edit.png
	public_html/res/pnotify/oxygen/16/actions/document-encrypt.png
	public_html/res/pnotify/oxygen/16/actions/document-export-table.png
	public_html/res/pnotify/oxygen/16/actions/document-export.png
	public_html/res/pnotify/oxygen/16/actions/document-import.png
	public_html/res/pnotify/oxygen/16/actions/document-new.png
	public_html/res/pnotify/oxygen/16/actions/document-open-data.png
	public_html/res/pnotify/oxygen/16/actions/document-open-folder.png
	public_html/res/pnotify/oxygen/16/actions/document-open-recent.png
	public_html/res/pnotify/oxygen/16/actions/document-open-remote.png
	public_html/res/pnotify/oxygen/16/actions/document-open.png
	public_html/res/pnotify/oxygen/16/actions/document-preview-archive.png
	public_html/res/pnotify/oxygen/16/actions/document-preview.png
	public_html/res/pnotify/oxygen/16/actions/document-print-preview.png
	public_html/res/pnotify/oxygen/16/actions/document-print.png
	public_html/res/pnotify/oxygen/16/actions/document-properties.png
	public_html/res/pnotify/oxygen/16/actions/document-revert.png
	public_html/res/pnotify/oxygen/16/actions/document-save-all.png
	public_html/res/pnotify/oxygen/16/actions/document-save-as.png
	public_html/res/pnotify/oxygen/16/actions/document-save.png
	public_html/res/pnotify/oxygen/16/actions/document-sign.png
	public_html/res/pnotify/oxygen/16/actions/document-swap.png
	public_html/res/pnotify/oxygen/16/actions/documentation.png
	public_html/res/pnotify/oxygen/16/actions/documentinfo.png
	public_html/res/pnotify/oxygen/16/actions/download-later.png
	public_html/res/pnotify/oxygen/16/actions/download.png
	public_html/res/pnotify/oxygen/16/actions/edit-bomb.png
	public_html/res/pnotify/oxygen/16/actions/edit-clear-history.png
	public_html/res/pnotify/oxygen/16/actions/edit-clear-list.png
	public_html/res/pnotify/oxygen/16/actions/edit-clear-locationbar-ltr.png
	public_html/res/pnotify/oxygen/16/actions/edit-clear-locationbar-rtl.png
	public_html/res/pnotify/oxygen/16/actions/edit-clear.png
	public_html/res/pnotify/oxygen/16/actions/edit-copy.png
	public_html/res/pnotify/oxygen/16/actions/edit-cut.png
	public_html/res/pnotify/oxygen/16/actions/edit-delete-shred.png
	public_html/res/pnotify/oxygen/16/actions/edit-delete.png
	public_html/res/pnotify/oxygen/16/actions/edit-find-replace.png
	public_html/res/pnotify/oxygen/16/actions/edit-find.png
	public_html/res/pnotify/oxygen/16/actions/edit-link.png
	public_html/res/pnotify/oxygen/16/actions/edit-paste.png
	public_html/res/pnotify/oxygen/16/actions/edit-redo.png
	public_html/res/pnotify/oxygen/16/actions/edit-rename.png
	public_html/res/pnotify/oxygen/16/actions/edit-select-all.png
	public_html/res/pnotify/oxygen/16/actions/edit-select.png
	public_html/res/pnotify/oxygen/16/actions/edit-table-delete-column.png
	public_html/res/pnotify/oxygen/16/actions/edit-table-delete-row.png
	public_html/res/pnotify/oxygen/16/actions/edit-table-insert-column-left.png
	public_html/res/pnotify/oxygen/16/actions/edit-table-insert-column-right.png
	public_html/res/pnotify/oxygen/16/actions/edit-table-insert-row-above.png
	public_html/res/pnotify/oxygen/16/actions/edit-table-insert-row-under.png
	public_html/res/pnotify/oxygen/16/actions/edit-text-frame-update.png
	public_html/res/pnotify/oxygen/16/actions/edit-undo.png
	public_html/res/pnotify/oxygen/16/actions/feed-subscribe.png
	public_html/res/pnotify/oxygen/16/actions/fill-color.png
	public_html/res/pnotify/oxygen/16/actions/flag-black.png
	public_html/res/pnotify/oxygen/16/actions/flag-blue.png
	public_html/res/pnotify/oxygen/16/actions/flag-green.png
	public_html/res/pnotify/oxygen/16/actions/flag-red.png
	public_html/res/pnotify/oxygen/16/actions/flag-yellow.png
	public_html/res/pnotify/oxygen/16/actions/flag.png
	public_html/res/pnotify/oxygen/16/actions/folder-new.png
	public_html/res/pnotify/oxygen/16/actions/folder-sync.png
	public_html/res/pnotify/oxygen/16/actions/fork.png
	public_html/res/pnotify/oxygen/16/actions/get-hot-new-stuff.png
	public_html/res/pnotify/oxygen/16/actions/go-bottom.png
	public_html/res/pnotify/oxygen/16/actions/go-down-search.png
	public_html/res/pnotify/oxygen/16/actions/go-down.png
	public_html/res/pnotify/oxygen/16/actions/go-first-view.png
	public_html/res/pnotify/oxygen/16/actions/go-first.png
	public_html/res/pnotify/oxygen/16/actions/go-home.png
	public_html/res/pnotify/oxygen/16/actions/go-jump-locationbar.png
	public_html/res/pnotify/oxygen/16/actions/go-jump-today.png
	public_html/res/pnotify/oxygen/16/actions/go-jump.png
	public_html/res/pnotify/oxygen/16/actions/go-last-view.png
	public_html/res/pnotify/oxygen/16/actions/go-last.png
	public_html/res/pnotify/oxygen/16/actions/go-next-view.png
	public_html/res/pnotify/oxygen/16/actions/go-next.png
	public_html/res/pnotify/oxygen/16/actions/go-parent-folder.png
	public_html/res/pnotify/oxygen/16/actions/go-previous-view.png
	public_html/res/pnotify/oxygen/16/actions/go-previous.png
	public_html/res/pnotify/oxygen/16/actions/go-top.png
	public_html/res/pnotify/oxygen/16/actions/go-up-search.png
	public_html/res/pnotify/oxygen/16/actions/go-up.png
	public_html/res/pnotify/oxygen/16/actions/help-about.png
	public_html/res/pnotify/oxygen/16/actions/help-contents.png
	public_html/res/pnotify/oxygen/16/actions/help-contextual.png
	public_html/res/pnotify/oxygen/16/actions/help-hint.png
	public_html/res/pnotify/oxygen/16/actions/im-ban-kick-user.png
	public_html/res/pnotify/oxygen/16/actions/im-ban-user.png
	public_html/res/pnotify/oxygen/16/actions/im-invisible-user.png
	public_html/res/pnotify/oxygen/16/actions/im-kick-user.png
	public_html/res/pnotify/oxygen/16/actions/im-user-away.png
	public_html/res/pnotify/oxygen/16/actions/im-user-busy.png
	public_html/res/pnotify/oxygen/16/actions/im-user-offline.png
	public_html/res/pnotify/oxygen/16/actions/im-user.png
	public_html/res/pnotify/oxygen/16/actions/insert-button.png
	public_html/res/pnotify/oxygen/16/actions/insert-horizontal-rule.png
	public_html/res/pnotify/oxygen/16/actions/insert-image.png
	public_html/res/pnotify/oxygen/16/actions/insert-link.png
	public_html/res/pnotify/oxygen/16/actions/insert-table.png
	public_html/res/pnotify/oxygen/16/actions/insert-text-frame.png
	public_html/res/pnotify/oxygen/16/actions/insert-text.png
	public_html/res/pnotify/oxygen/16/actions/layer-visible-off.png
	public_html/res/pnotify/oxygen/16/actions/layer-visible-on.png
	public_html/res/pnotify/oxygen/16/actions/list-add-font.png
	public_html/res/pnotify/oxygen/16/actions/list-add-user.png
	public_html/res/pnotify/oxygen/16/actions/list-add.png
	public_html/res/pnotify/oxygen/16/actions/list-remove-user.png
	public_html/res/pnotify/oxygen/16/actions/list-remove.png
	public_html/res/pnotify/oxygen/16/actions/list-resource-add.png
	public_html/res/pnotify/oxygen/16/actions/mail-flag.png
	public_html/res/pnotify/oxygen/16/actions/mail-forward.png
	public_html/res/pnotify/oxygen/16/actions/mail-invitation.png
	public_html/res/pnotify/oxygen/16/actions/mail-mark-important.png
	public_html/res/pnotify/oxygen/16/actions/mail-mark-junk.png
	public_html/res/pnotify/oxygen/16/actions/mail-mark-notjunk.png
	public_html/res/pnotify/oxygen/16/actions/mail-mark-read.png
	public_html/res/pnotify/oxygen/16/actions/mail-mark-unread-new.png
	public_html/res/pnotify/oxygen/16/actions/mail-mark-unread.png
	public_html/res/pnotify/oxygen/16/actions/mail-message-new.png
	public_html/res/pnotify/oxygen/16/actions/mail-queue.png
	public_html/res/pnotify/oxygen/16/actions/mail-receive.png
	public_html/res/pnotify/oxygen/16/actions/mail-reply-all.png
	public_html/res/pnotify/oxygen/16/actions/mail-reply-custom-all.png
	public_html/res/pnotify/oxygen/16/actions/mail-reply-custom.png
	public_html/res/pnotify/oxygen/16/actions/mail-reply-list.png
	public_html/res/pnotify/oxygen/16/actions/mail-reply-sender.png
	public_html/res/pnotify/oxygen/16/actions/mail-send.png
	public_html/res/pnotify/oxygen/16/actions/measure.png
	public_html/res/pnotify/oxygen/16/actions/media-eject.png
	public_html/res/pnotify/oxygen/16/actions/media-playback-pause.png
	public_html/res/pnotify/oxygen/16/actions/media-playback-start.png
	public_html/res/pnotify/oxygen/16/actions/media-playback-stop.png
	public_html/res/pnotify/oxygen/16/actions/media-record.png
	public_html/res/pnotify/oxygen/16/actions/media-seek-backward.png
	public_html/res/pnotify/oxygen/16/actions/media-seek-forward.png
	public_html/res/pnotify/oxygen/16/actions/media-skip-backward.png
	public_html/res/pnotify/oxygen/16/actions/media-skip-forward.png
	public_html/res/pnotify/oxygen/16/actions/meeting-attending-tentative.png
	public_html/res/pnotify/oxygen/16/actions/meeting-attending.png
	public_html/res/pnotify/oxygen/16/actions/milestone.png
	public_html/res/pnotify/oxygen/16/actions/network-connect.png
	public_html/res/pnotify/oxygen/16/actions/network-disconnect.png
	public_html/res/pnotify/oxygen/16/actions/news-subscribe.png
	public_html/res/pnotify/oxygen/16/actions/news-unsubscribe.png
	public_html/res/pnotify/oxygen/16/actions/object-flip-horizontal.png
	public_html/res/pnotify/oxygen/16/actions/object-flip-vertical.png
	public_html/res/pnotify/oxygen/16/actions/object-group.png
	public_html/res/pnotify/oxygen/16/actions/object-order-back.png
	public_html/res/pnotify/oxygen/16/actions/object-order-front.png
	public_html/res/pnotify/oxygen/16/actions/object-order-lower.png
	public_html/res/pnotify/oxygen/16/actions/object-order-raise.png
	public_html/res/pnotify/oxygen/16/actions/object-rotate-left.png
	public_html/res/pnotify/oxygen/16/actions/object-rotate-right.png
	public_html/res/pnotify/oxygen/16/actions/object-ungroup.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-area-precentage.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-area-stacked.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-area.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-bar-percentage.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-bar-stacked.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-bar.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-line-percentage.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-line-stacked.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-line.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-pie.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-polar-stacked.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-polar.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-ring.png
	public_html/res/pnotify/oxygen/16/actions/office-chart-scatter.png
	public_html/res/pnotify/oxygen/16/actions/page-zoom.png
	public_html/res/pnotify/oxygen/16/actions/player-time.png
	public_html/res/pnotify/oxygen/16/actions/player-volume.png
	public_html/res/pnotify/oxygen/16/actions/preflight-verifier.png
	public_html/res/pnotify/oxygen/16/actions/process-stop.png
	public_html/res/pnotify/oxygen/16/actions/project-development-close-all.png
	public_html/res/pnotify/oxygen/16/actions/project-development-close.png
	public_html/res/pnotify/oxygen/16/actions/project-development-new-template.png
	public_html/res/pnotify/oxygen/16/actions/project-development.png
	public_html/res/pnotify/oxygen/16/actions/project-open.png
	public_html/res/pnotify/oxygen/16/actions/rating.png
	public_html/res/pnotify/oxygen/16/actions/resource-calendar-child-insert.png
	public_html/res/pnotify/oxygen/16/actions/resource-calendar-insert.png
	public_html/res/pnotify/oxygen/16/actions/resource-group-new.png
	public_html/res/pnotify/oxygen/16/actions/resource-group.png
	public_html/res/pnotify/oxygen/16/actions/roll.png
	public_html/res/pnotify/oxygen/16/actions/select-rectangular.png
	public_html/res/pnotify/oxygen/16/actions/services.png
	public_html/res/pnotify/oxygen/16/actions/show-menu.png
	public_html/res/pnotify/oxygen/16/actions/speaker.png
	public_html/res/pnotify/oxygen/16/actions/story-editor.png
	public_html/res/pnotify/oxygen/16/actions/svn-commit.png
	public_html/res/pnotify/oxygen/16/actions/svn-update.png
	public_html/res/pnotify/oxygen/16/actions/system-lock-screen.png
	public_html/res/pnotify/oxygen/16/actions/system-log-out.png
	public_html/res/pnotify/oxygen/16/actions/system-reboot.png
	public_html/res/pnotify/oxygen/16/actions/system-run.png
	public_html/res/pnotify/oxygen/16/actions/system-search.png
	public_html/res/pnotify/oxygen/16/actions/system-shutdown.png
	public_html/res/pnotify/oxygen/16/actions/system-suspend-hibernate.png
	public_html/res/pnotify/oxygen/16/actions/system-suspend.png
	public_html/res/pnotify/oxygen/16/actions/system-switch-user.png
	public_html/res/pnotify/oxygen/16/actions/tab-close-other.png
	public_html/res/pnotify/oxygen/16/actions/tab-close.png
	public_html/res/pnotify/oxygen/16/actions/tab-detach.png
	public_html/res/pnotify/oxygen/16/actions/tab-duplicate.png
	public_html/res/pnotify/oxygen/16/actions/tab-new-background.png
	public_html/res/pnotify/oxygen/16/actions/tab-new.png
	public_html/res/pnotify/oxygen/16/actions/text-field.png
	public_html/res/pnotify/oxygen/16/actions/text-frame-link.png
	public_html/res/pnotify/oxygen/16/actions/text-frame-unlink.png
	public_html/res/pnotify/oxygen/16/actions/text-speak.png
	public_html/res/pnotify/oxygen/16/actions/tool-animator.png
	public_html/res/pnotify/oxygen/16/actions/tools-check-spelling.png
	public_html/res/pnotify/oxygen/16/actions/tools-report-bug.png
	public_html/res/pnotify/oxygen/16/actions/tools-wizard.png
	public_html/res/pnotify/oxygen/16/actions/transform-crop-and-resize.png
	public_html/res/pnotify/oxygen/16/actions/transform-crop.png
	public_html/res/pnotify/oxygen/16/actions/transform-move.png
	public_html/res/pnotify/oxygen/16/actions/transform-rotate.png
	public_html/res/pnotify/oxygen/16/actions/transform-scale.png
	public_html/res/pnotify/oxygen/16/actions/transform-shear-down.png
	public_html/res/pnotify/oxygen/16/actions/transform-shear-left.png
	public_html/res/pnotify/oxygen/16/actions/transform-shear-right.png
	public_html/res/pnotify/oxygen/16/actions/transform-shear-up.png
	public_html/res/pnotify/oxygen/16/actions/trash-empty.png
	public_html/res/pnotify/oxygen/16/actions/user-group-delete.png
	public_html/res/pnotify/oxygen/16/actions/user-group-new.png
	public_html/res/pnotify/oxygen/16/actions/user-group-properties.png
	public_html/res/pnotify/oxygen/16/actions/user-properties.png
	public_html/res/pnotify/oxygen/16/actions/view-bank.png
	public_html/res/pnotify/oxygen/16/actions/view-barcode-add.png
	public_html/res/pnotify/oxygen/16/actions/view-barcode.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-agenda.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-birthday.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-day.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-holiday.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-journal.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-list.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-month.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-special-occasion.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-tasks.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-time-spent.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-timeline.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-upcoming-days.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-upcoming-events.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-wedding-anniversary.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-week.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-whatsnext.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar-workweek.png
	public_html/res/pnotify/oxygen/16/actions/view-calendar.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-add.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-export-secret.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-export-server.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-export.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-import.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-server-configure.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate-sign.png
	public_html/res/pnotify/oxygen/16/actions/view-certificate.png
	public_html/res/pnotify/oxygen/16/actions/view-choose.png
	public_html/res/pnotify/oxygen/16/actions/view-close.png
	public_html/res/pnotify/oxygen/16/actions/view-file-columns.png
	public_html/res/pnotify/oxygen/16/actions/view-filter.png
	public_html/res/pnotify/oxygen/16/actions/view-form-action.png
	public_html/res/pnotify/oxygen/16/actions/view-form-table.png
	public_html/res/pnotify/oxygen/16/actions/view-form.png
	public_html/res/pnotify/oxygen/16/actions/view-fullscreen.png
	public_html/res/pnotify/oxygen/16/actions/view-grid.png
	public_html/res/pnotify/oxygen/16/actions/view-history.png
	public_html/res/pnotify/oxygen/16/actions/view-ldap-resource.png
	public_html/res/pnotify/oxygen/16/actions/view-left-close.png
	public_html/res/pnotify/oxygen/16/actions/view-list-details.png
	public_html/res/pnotify/oxygen/16/actions/view-list-icons.png
	public_html/res/pnotify/oxygen/16/actions/view-list-text.png
	public_html/res/pnotify/oxygen/16/actions/view-list-tree.png
	public_html/res/pnotify/oxygen/16/actions/view-media-artist.png
	public_html/res/pnotify/oxygen/16/actions/view-media-equalizer.png
	public_html/res/pnotify/oxygen/16/actions/view-media-lyrics.png
	public_html/res/pnotify/oxygen/16/actions/view-media-playlist.png
	public_html/res/pnotify/oxygen/16/actions/view-media-visualization.png
	public_html/res/pnotify/oxygen/16/actions/view-multiple-objects.png
	public_html/res/pnotify/oxygen/16/actions/view-object-histogram-linear.png
	public_html/res/pnotify/oxygen/16/actions/view-object-histogram-logarithmic.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-calendar.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-contacts.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-journal.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-mail.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-news.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-notes.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-summary.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-tasks-pending.png
	public_html/res/pnotify/oxygen/16/actions/view-pim-tasks.png
	public_html/res/pnotify/oxygen/16/actions/view-presentation.png
	public_html/res/pnotify/oxygen/16/actions/view-preview.png
	public_html/res/pnotify/oxygen/16/actions/view-process-all-tree.png
	public_html/res/pnotify/oxygen/16/actions/view-process-all.png
	public_html/res/pnotify/oxygen/16/actions/view-process-own.png
	public_html/res/pnotify/oxygen/16/actions/view-process-system.png
	public_html/res/pnotify/oxygen/16/actions/view-process-tree.png
	public_html/res/pnotify/oxygen/16/actions/view-process-users.png
	public_html/res/pnotify/oxygen/16/actions/view-refresh.png
	public_html/res/pnotify/oxygen/16/actions/view-resource-calendar.png
	public_html/res/pnotify/oxygen/16/actions/view-restore.png
	public_html/res/pnotify/oxygen/16/actions/view-right-close.png
	public_html/res/pnotify/oxygen/16/actions/view-right-new.png
	public_html/res/pnotify/oxygen/16/actions/view-sidetree.png
	public_html/res/pnotify/oxygen/16/actions/view-sort-ascending.png
	public_html/res/pnotify/oxygen/16/actions/view-sort-descending.png
	public_html/res/pnotify/oxygen/16/actions/view-split-left-right.png
	public_html/res/pnotify/oxygen/16/actions/view-split-top-bottom.png
	public_html/res/pnotify/oxygen/16/actions/view-statistics.png
	public_html/res/pnotify/oxygen/16/actions/view-task-add.png
	public_html/res/pnotify/oxygen/16/actions/view-task-child.png
	public_html/res/pnotify/oxygen/16/actions/view-task.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule-baselined-add.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule-baselined-remove.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule-baselined.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule-calculus.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule-child-insert.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule-edit.png
	public_html/res/pnotify/oxygen/16/actions/view-time-schedule.png
	public_html/res/pnotify/oxygen/16/actions/view-web-browser-dom-tree.png
	public_html/res/pnotify/oxygen/16/actions/window-close.png
	public_html/res/pnotify/oxygen/16/actions/window-duplicate.png
	public_html/res/pnotify/oxygen/16/actions/window-new.png
	public_html/res/pnotify/oxygen/16/actions/zoom-fit-best.png
	public_html/res/pnotify/oxygen/16/actions/zoom-fit-height.png
	public_html/res/pnotify/oxygen/16/actions/zoom-fit-width.png
	public_html/res/pnotify/oxygen/16/actions/zoom-in.png
	public_html/res/pnotify/oxygen/16/actions/zoom-original.png
	public_html/res/pnotify/oxygen/16/actions/zoom-out.png
	public_html/res/pnotify/oxygen/16/animations/process-working.png
	public_html/res/pnotify/oxygen/16/animations/throbber.gif
	public_html/res/pnotify/oxygen/16/apps/accessories-calculator.png
	public_html/res/pnotify/oxygen/16/apps/accessories-character-map.png
	public_html/res/pnotify/oxygen/16/apps/accessories-dictionary.png
	public_html/res/pnotify/oxygen/16/apps/accessories-text-editor.png
	public_html/res/pnotify/oxygen/16/apps/clock.png
	public_html/res/pnotify/oxygen/16/apps/graphics-viewer-document.png
	public_html/res/pnotify/oxygen/16/apps/help-browser.png
	public_html/res/pnotify/oxygen/16/apps/internet-mail.png
	public_html/res/pnotify/oxygen/16/apps/internet-telephony.png
	public_html/res/pnotify/oxygen/16/apps/internet-web-browser.png
	public_html/res/pnotify/oxygen/16/apps/multimedia-volume-control.png
	public_html/res/pnotify/oxygen/16/apps/office-address-book.png
	public_html/res/pnotify/oxygen/16/apps/office-calendar.png
	public_html/res/pnotify/oxygen/16/apps/preferences-contact-list.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-accessibility.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-color.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-cryptography.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-default-applications.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-display-color.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-display.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-filetype-association.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-font.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-gaming.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-icons.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-keyboard.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-launch-feedback.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-locale.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-mouse.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-notification-bell.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-notification.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-printer.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-screensaver.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-sound.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-text-to-speech.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-theme.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-user-password.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-user.png
	public_html/res/pnotify/oxygen/16/apps/preferences-desktop-wallpaper.png
	public_html/res/pnotify/oxygen/16/apps/preferences-plugin-script.png
	public_html/res/pnotify/oxygen/16/apps/preferences-plugin.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-bluetooth.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-login.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-network-sharing.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-performance.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-power-management.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-session-services.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-time.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-windows-actions.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-windows-move.png
	public_html/res/pnotify/oxygen/16/apps/preferences-system-windows.png
	public_html/res/pnotify/oxygen/16/apps/preferences-web-browser-adblock.png
	public_html/res/pnotify/oxygen/16/apps/preferences-web-browser-cache.png
	public_html/res/pnotify/oxygen/16/apps/preferences-web-browser-cookies.png
	public_html/res/pnotify/oxygen/16/apps/preferences-web-browser-identification.png
	public_html/res/pnotify/oxygen/16/apps/preferences-web-browser-shortcuts.png
	public_html/res/pnotify/oxygen/16/apps/preferences-web-browser-stylesheets.png
	public_html/res/pnotify/oxygen/16/apps/system-file-manager.png
	public_html/res/pnotify/oxygen/16/apps/system-software-update.png
	public_html/res/pnotify/oxygen/16/apps/system-users.png
	public_html/res/pnotify/oxygen/16/apps/utilities-desktop-extra.png
	public_html/res/pnotify/oxygen/16/apps/utilities-file-archiver.png
	public_html/res/pnotify/oxygen/16/apps/utilities-log-viewer.png
	public_html/res/pnotify/oxygen/16/apps/utilities-system-monitor.png
	public_html/res/pnotify/oxygen/16/apps/utilities-terminal.png
	public_html/res/pnotify/oxygen/16/categories/applications-accessories.png
	public_html/res/pnotify/oxygen/16/categories/applications-development-translation.png
	public_html/res/pnotify/oxygen/16/categories/applications-development-web.png
	public_html/res/pnotify/oxygen/16/categories/applications-development.png
	public_html/res/pnotify/oxygen/16/categories/applications-education-language.png
	public_html/res/pnotify/oxygen/16/categories/applications-education-mathematics.png
	public_html/res/pnotify/oxygen/16/categories/applications-education.png
	public_html/res/pnotify/oxygen/16/categories/applications-engineering.png
	public_html/res/pnotify/oxygen/16/categories/applications-games.png
	public_html/res/pnotify/oxygen/16/categories/applications-graphics.png
	public_html/res/pnotify/oxygen/16/categories/applications-internet.png
	public_html/res/pnotify/oxygen/16/categories/applications-multimedia.png
	public_html/res/pnotify/oxygen/16/categories/applications-office.png
	public_html/res/pnotify/oxygen/16/categories/applications-other.png
	public_html/res/pnotify/oxygen/16/categories/applications-science.png
	public_html/res/pnotify/oxygen/16/categories/applications-system.png
	public_html/res/pnotify/oxygen/16/categories/applications-toys.png
	public_html/res/pnotify/oxygen/16/categories/applications-utilities.png
	public_html/res/pnotify/oxygen/16/categories/preferences-desktop-peripherals.png
	public_html/res/pnotify/oxygen/16/categories/preferences-desktop-personal.png
	public_html/res/pnotify/oxygen/16/categories/preferences-desktop.png
	public_html/res/pnotify/oxygen/16/categories/preferences-other.png
	public_html/res/pnotify/oxygen/16/categories/preferences-system-network.png
	public_html/res/pnotify/oxygen/16/categories/preferences-system.png
	public_html/res/pnotify/oxygen/16/categories/system-help.png
	public_html/res/pnotify/oxygen/16/devices/audio-card.png
	public_html/res/pnotify/oxygen/16/devices/audio-headset.png
	public_html/res/pnotify/oxygen/16/devices/audio-input-line.png
	public_html/res/pnotify/oxygen/16/devices/audio-input-microphone.png
	public_html/res/pnotify/oxygen/16/devices/battery.png
	public_html/res/pnotify/oxygen/16/devices/camera-photo.png
	public_html/res/pnotify/oxygen/16/devices/camera-web.png
	public_html/res/pnotify/oxygen/16/devices/computer-laptop.png
	public_html/res/pnotify/oxygen/16/devices/computer.png
	public_html/res/pnotify/oxygen/16/devices/cpu.png
	public_html/res/pnotify/oxygen/16/devices/drive-harddisk.png
	public_html/res/pnotify/oxygen/16/devices/drive-optical.png
	public_html/res/pnotify/oxygen/16/devices/drive-removable-media-usb-pendrive.png
	public_html/res/pnotify/oxygen/16/devices/drive-removable-media-usb.png
	public_html/res/pnotify/oxygen/16/devices/drive-removable-media.png
	public_html/res/pnotify/oxygen/16/devices/input-gaming.png
	public_html/res/pnotify/oxygen/16/devices/input-keyboard.png
	public_html/res/pnotify/oxygen/16/devices/input-mouse.png
	public_html/res/pnotify/oxygen/16/devices/input-tablet.png
	public_html/res/pnotify/oxygen/16/devices/media-flash-memory-stick.png
	public_html/res/pnotify/oxygen/16/devices/media-flash-sd-mmc.png
	public_html/res/pnotify/oxygen/16/devices/media-flash-smart-media.png
	public_html/res/pnotify/oxygen/16/devices/media-flash.png
	public_html/res/pnotify/oxygen/16/devices/media-floppy.png
	public_html/res/pnotify/oxygen/16/devices/media-optical.png
	public_html/res/pnotify/oxygen/16/devices/media-tape.png
	public_html/res/pnotify/oxygen/16/devices/modem.png
	public_html/res/pnotify/oxygen/16/devices/multimedia-player.png
	public_html/res/pnotify/oxygen/16/devices/network-wired.png
	public_html/res/pnotify/oxygen/16/devices/network-wireless.png
	public_html/res/pnotify/oxygen/16/devices/pda.png
	public_html/res/pnotify/oxygen/16/devices/phone.png
	public_html/res/pnotify/oxygen/16/devices/printer.png
	public_html/res/pnotify/oxygen/16/devices/scanner.png
	public_html/res/pnotify/oxygen/16/devices/secure-card.png
	public_html/res/pnotify/oxygen/16/devices/video-display.png
	public_html/res/pnotify/oxygen/16/devices/video-projector.png
	public_html/res/pnotify/oxygen/16/devices/video-television.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-encrypted-locked.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-encrypted-unlocked.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-favorite.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-important.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-locked.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-mounted.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-symbolic-link.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-unlocked.png
	public_html/res/pnotify/oxygen/16/emblems/emblem-unmounted.png
	public_html/res/pnotify/oxygen/16/emblems/vcs-added.png
	public_html/res/pnotify/oxygen/16/emblems/vcs-conflicting.png
	public_html/res/pnotify/oxygen/16/emblems/vcs-locally-modified.png
	public_html/res/pnotify/oxygen/16/emblems/vcs-normal.png
	public_html/res/pnotify/oxygen/16/emblems/vcs-removed.png
	public_html/res/pnotify/oxygen/16/emblems/vcs-update-required.png
	public_html/res/pnotify/oxygen/16/emotes/face-angel.png
	public_html/res/pnotify/oxygen/16/emotes/face-embarrassed.png
	public_html/res/pnotify/oxygen/16/emotes/face-kiss.png
	public_html/res/pnotify/oxygen/16/emotes/face-laugh.png
	public_html/res/pnotify/oxygen/16/emotes/face-plain.png
	public_html/res/pnotify/oxygen/16/emotes/face-raspberry.png
	public_html/res/pnotify/oxygen/16/emotes/face-sad.png
	public_html/res/pnotify/oxygen/16/emotes/face-smile-big.png
	public_html/res/pnotify/oxygen/16/emotes/face-smile.png
	public_html/res/pnotify/oxygen/16/emotes/face-surprise.png
	public_html/res/pnotify/oxygen/16/emotes/face-uncertain.png
	public_html/res/pnotify/oxygen/16/emotes/face-wink.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-javascript.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-octet-stream.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-pdf.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-rss+xml.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-rtf.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-desktop.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-executable-script.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-executable.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-php.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-shellscript.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-shockwave-flash.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-trash.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-x-zerosize.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-xhtml+xml.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-xml.png
	public_html/res/pnotify/oxygen/16/mimetypes/application-xslt+xml.png
	public_html/res/pnotify/oxygen/16/mimetypes/audio-midi.png
	public_html/res/pnotify/oxygen/16/mimetypes/audio-x-generic.png
	public_html/res/pnotify/oxygen/16/mimetypes/encrypted.png
	public_html/res/pnotify/oxygen/16/mimetypes/image-svg+xml-compressed.png
	public_html/res/pnotify/oxygen/16/mimetypes/image-svg+xml.png
	public_html/res/pnotify/oxygen/16/mimetypes/image-x-generic.png
	public_html/res/pnotify/oxygen/16/mimetypes/inode-directory.png
	public_html/res/pnotify/oxygen/16/mimetypes/message-news.png
	public_html/res/pnotify/oxygen/16/mimetypes/message.png
	public_html/res/pnotify/oxygen/16/mimetypes/package-x-generic.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-calendar.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-css.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-csv.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-directory.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-html.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-plain.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-rtf.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-x-generic.png
	public_html/res/pnotify/oxygen/16/mimetypes/text-xml.png
	public_html/res/pnotify/oxygen/16/mimetypes/unknown.png
	public_html/res/pnotify/oxygen/16/mimetypes/video-x-generic.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-address-book.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-calendar.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-contact.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-database.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-document.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-presentation.png
	public_html/res/pnotify/oxygen/16/mimetypes/x-office-spreadsheet.png
	public_html/res/pnotify/oxygen/16/places/bookmarks.png
	public_html/res/pnotify/oxygen/16/places/certificate-server.png
	public_html/res/pnotify/oxygen/16/places/document-multiple.png
	public_html/res/pnotify/oxygen/16/places/favorites.png
	public_html/res/pnotify/oxygen/16/places/folder-blue.png
	public_html/res/pnotify/oxygen/16/places/folder-bookmark.png
	public_html/res/pnotify/oxygen/16/places/folder-brown.png
	public_html/res/pnotify/oxygen/16/places/folder-cyan.png
	public_html/res/pnotify/oxygen/16/places/folder-development.png
	public_html/res/pnotify/oxygen/16/places/folder-documents.png
	public_html/res/pnotify/oxygen/16/places/folder-downloads.png
	public_html/res/pnotify/oxygen/16/places/folder-favorites.png
	public_html/res/pnotify/oxygen/16/places/folder-green.png
	public_html/res/pnotify/oxygen/16/places/folder-grey.png
	public_html/res/pnotify/oxygen/16/places/folder-html.png
	public_html/res/pnotify/oxygen/16/places/folder-image.png
	public_html/res/pnotify/oxygen/16/places/folder-important.png
	public_html/res/pnotify/oxygen/16/places/folder-locked.png
	public_html/res/pnotify/oxygen/16/places/folder-orange.png
	public_html/res/pnotify/oxygen/16/places/folder-print.png
	public_html/res/pnotify/oxygen/16/places/folder-red.png
	public_html/res/pnotify/oxygen/16/places/folder-remote.png
	public_html/res/pnotify/oxygen/16/places/folder-sound.png
	public_html/res/pnotify/oxygen/16/places/folder-tar.png
	public_html/res/pnotify/oxygen/16/places/folder-txt.png
	public_html/res/pnotify/oxygen/16/places/folder-video.png
	public_html/res/pnotify/oxygen/16/places/folder-violet.png
	public_html/res/pnotify/oxygen/16/places/folder-yellow.png
	public_html/res/pnotify/oxygen/16/places/folder.png
	public_html/res/pnotify/oxygen/16/places/mail-folder-inbox.png
	public_html/res/pnotify/oxygen/16/places/mail-folder-outbox.png
	public_html/res/pnotify/oxygen/16/places/mail-folder-sent.png
	public_html/res/pnotify/oxygen/16/places/mail-message.png
	public_html/res/pnotify/oxygen/16/places/network-server-database.png
	public_html/res/pnotify/oxygen/16/places/network-server.png
	public_html/res/pnotify/oxygen/16/places/network-workgroup.png
	public_html/res/pnotify/oxygen/16/places/repository.png
	public_html/res/pnotify/oxygen/16/places/server-database.png
	public_html/res/pnotify/oxygen/16/places/start-here.png
	public_html/res/pnotify/oxygen/16/places/user-desktop.png
	public_html/res/pnotify/oxygen/16/places/user-home.png
	public_html/res/pnotify/oxygen/16/places/user-identity.png
	public_html/res/pnotify/oxygen/16/places/user-trash.png
	public_html/res/pnotify/oxygen/16/status/appointment-recurring.png
	public_html/res/pnotify/oxygen/16/status/appointment-reminder.png
	public_html/res/pnotify/oxygen/16/status/audio-volume-high.png
	public_html/res/pnotify/oxygen/16/status/audio-volume-low.png
	public_html/res/pnotify/oxygen/16/status/audio-volume-medium.png
	public_html/res/pnotify/oxygen/16/status/audio-volume-muted.png
	public_html/res/pnotify/oxygen/16/status/dialog-error.png
	public_html/res/pnotify/oxygen/16/status/dialog-information.png
	public_html/res/pnotify/oxygen/16/status/dialog-password.png
	public_html/res/pnotify/oxygen/16/status/dialog-warning.png
	public_html/res/pnotify/oxygen/16/status/folder-open.png
	public_html/res/pnotify/oxygen/16/status/image-loading.png
	public_html/res/pnotify/oxygen/16/status/image-missing.png
	public_html/res/pnotify/oxygen/16/status/mail-attachment.png
	public_html/res/pnotify/oxygen/16/status/mail-forwarded.png
	public_html/res/pnotify/oxygen/16/status/mail-queued.png
	public_html/res/pnotify/oxygen/16/status/mail-read.png
	public_html/res/pnotify/oxygen/16/status/mail-replied.png
	public_html/res/pnotify/oxygen/16/status/mail-sent.png
	public_html/res/pnotify/oxygen/16/status/mail-tagged.png
	public_html/res/pnotify/oxygen/16/status/mail-task.png
	public_html/res/pnotify/oxygen/16/status/mail-unread-new.png
	public_html/res/pnotify/oxygen/16/status/mail-unread.png
	public_html/res/pnotify/oxygen/16/status/media-playlist-repeat.png
	public_html/res/pnotify/oxygen/16/status/media-playlist-shuffle.png
	public_html/res/pnotify/oxygen/16/status/meeting-organizer.png
	public_html/res/pnotify/oxygen/16/status/object-locked.png
	public_html/res/pnotify/oxygen/16/status/object-unlocked.png
	public_html/res/pnotify/oxygen/16/status/script-error.png
	public_html/res/pnotify/oxygen/16/status/security-high.png
	public_html/res/pnotify/oxygen/16/status/security-low.png
	public_html/res/pnotify/oxygen/16/status/security-medium.png
	public_html/res/pnotify/oxygen/16/status/task-complete.png
	public_html/res/pnotify/oxygen/16/status/task-recurring.png
	public_html/res/pnotify/oxygen/16/status/task-reminder.png
	public_html/res/pnotify/oxygen/16/status/user-away-extended.png
	public_html/res/pnotify/oxygen/16/status/user-away.png
	public_html/res/pnotify/oxygen/16/status/user-busy.png
	public_html/res/pnotify/oxygen/16/status/user-invisible.png
	public_html/res/pnotify/oxygen/16/status/user-offline.png
	public_html/res/pnotify/oxygen/16/status/user-online.png
	public_html/res/pnotify/oxygen/16/status/user-trash-full.png
	public_html/res/pnotify/oxygen/16/status/weather-clear-night.png
	public_html/res/pnotify/oxygen/16/status/weather-clear.png
	public_html/res/pnotify/oxygen/16/status/weather-clouds-night.png
	public_html/res/pnotify/oxygen/16/status/weather-clouds.png
	public_html/res/pnotify/oxygen/16/status/weather-few-clouds-night.png
	public_html/res/pnotify/oxygen/16/status/weather-few-clouds.png
	public_html/res/pnotify/oxygen/16/status/weather-freezing-rain.png
	public_html/res/pnotify/oxygen/16/status/weather-hail.png
	public_html/res/pnotify/oxygen/16/status/weather-many-clouds.png
	public_html/res/pnotify/oxygen/16/status/weather-mist.png
	public_html/res/pnotify/oxygen/16/status/weather-showers-day.png
	public_html/res/pnotify/oxygen/16/status/weather-showers-night.png
	public_html/res/pnotify/oxygen/16/status/weather-showers-scattered-day.png
	public_html/res/pnotify/oxygen/16/status/weather-showers-scattered-night.png
	public_html/res/pnotify/oxygen/16/status/weather-showers-scattered.png
	public_html/res/pnotify/oxygen/16/status/weather-showers.png
	public_html/res/pnotify/oxygen/16/status/weather-snow-rain.png
	public_html/res/pnotify/oxygen/16/status/weather-snow-scattered-day.png
	public_html/res/pnotify/oxygen/16/status/weather-snow-scattered-night.png
	public_html/res/pnotify/oxygen/16/status/weather-snow-scattered.png
	public_html/res/pnotify/oxygen/16/status/weather-snow.png
	public_html/res/pnotify/oxygen/16/status/weather-storm.png
	public_html/res/pnotify/oxygen/16/status/window-suppressed.png
	public_html/res/pnotify/oxygen/32/actions/arrow-down.png
	public_html/res/pnotify/oxygen/32/actions/arrow-left.png
	public_html/res/pnotify/oxygen/32/actions/arrow-up.png
	public_html/res/pnotify/oxygen/32/actions/checkbox.png
	public_html/res/pnotify/oxygen/32/actions/configure.png
	public_html/res/pnotify/oxygen/32/actions/dialog-ok.png
	public_html/res/pnotify/oxygen/32/actions/download.png
	public_html/res/pnotify/oxygen/32/actions/edit-bomb.png
	public_html/res/pnotify/oxygen/32/actions/edit-clear.png
	public_html/res/pnotify/oxygen/32/actions/edit-copy.png
	public_html/res/pnotify/oxygen/32/actions/edit-cut.png
	public_html/res/pnotify/oxygen/32/actions/edit-find.png
	public_html/res/pnotify/oxygen/32/actions/edit-paste.png
	public_html/res/pnotify/oxygen/32/actions/edit-redo.png
	public_html/res/pnotify/oxygen/32/actions/edit-undo.png
	public_html/res/pnotify/oxygen/32/actions/fill-color.png
	public_html/res/pnotify/oxygen/32/actions/flag-black.png
	public_html/res/pnotify/oxygen/32/actions/flag-blue.png
	public_html/res/pnotify/oxygen/32/actions/flag-green.png
	public_html/res/pnotify/oxygen/32/actions/flag-red.png
	public_html/res/pnotify/oxygen/32/actions/flag.png
	public_html/res/pnotify/oxygen/32/actions/folder-new.png
	public_html/res/pnotify/oxygen/32/actions/fork.png
	public_html/res/pnotify/oxygen/32/actions/go-bottom.png
	public_html/res/pnotify/oxygen/32/actions/go-down.png
	public_html/res/pnotify/oxygen/32/actions/go-first.png
	public_html/res/pnotify/oxygen/32/actions/go-home.png
	public_html/res/pnotify/oxygen/32/actions/go-jump.png
	public_html/res/pnotify/oxygen/32/actions/go-last.png
	public_html/res/pnotify/oxygen/32/actions/go-next.png
	public_html/res/pnotify/oxygen/32/actions/go-top.png
	public_html/res/pnotify/oxygen/32/actions/go-up.png
	public_html/res/pnotify/oxygen/32/actions/help-hint.png
	public_html/res/pnotify/oxygen/32/actions/im-user.png
	public_html/res/pnotify/oxygen/32/actions/list-add.png
	public_html/res/pnotify/oxygen/32/actions/mail-flag.png
	public_html/res/pnotify/oxygen/32/actions/mail-send.png
	public_html/res/pnotify/oxygen/32/actions/measure.png
	public_html/res/pnotify/oxygen/32/actions/milestone.png
	public_html/res/pnotify/oxygen/32/actions/page-zoom.png
	public_html/res/pnotify/oxygen/32/actions/rating.png
	public_html/res/pnotify/oxygen/32/actions/roll.png
	public_html/res/pnotify/oxygen/32/actions/services.png
	public_html/res/pnotify/oxygen/32/actions/shapes.png
	public_html/res/pnotify/oxygen/32/actions/show-menu.png
	public_html/res/pnotify/oxygen/32/actions/speaker.png
	public_html/res/pnotify/oxygen/32/actions/split.png
	public_html/res/pnotify/oxygen/32/actions/tab-close.png
	public_html/res/pnotify/oxygen/32/actions/tab-new.png
	public_html/res/pnotify/oxygen/32/actions/task-new.png
	public_html/res/pnotify/oxygen/32/actions/view-bank.png
	public_html/res/pnotify/oxygen/32/actions/view-form.png
	public_html/res/pnotify/oxygen/32/actions/view-grid.png
	public_html/res/pnotify/oxygen/32/actions/view-task.png
	public_html/res/pnotify/oxygen/32/actions/zoom-in.png
	public_html/res/pnotify/oxygen/32/actions/zoom-out.png
	public_html/res/pnotify/oxygen/32/apps/accessories-calculator.png
	public_html/res/pnotify/oxygen/32/apps/accessories-character-map.png
	public_html/res/pnotify/oxygen/32/apps/accessories-dictionary.png
	public_html/res/pnotify/oxygen/32/apps/accessories-text-editor.png
	public_html/res/pnotify/oxygen/32/apps/clock.png
	public_html/res/pnotify/oxygen/32/apps/graphics-viewer-document.png
	public_html/res/pnotify/oxygen/32/apps/help-browser.png
	public_html/res/pnotify/oxygen/32/apps/internet-mail.png
	public_html/res/pnotify/oxygen/32/apps/internet-telephony.png
	public_html/res/pnotify/oxygen/32/apps/internet-web-browser.png
	public_html/res/pnotify/oxygen/32/apps/multimedia-volume-control.png
	public_html/res/pnotify/oxygen/32/apps/office-address-book.png
	public_html/res/pnotify/oxygen/32/apps/office-calendar.png
	public_html/res/pnotify/oxygen/32/apps/preferences-contact-list.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-accessibility.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-color.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-cryptography.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-default-applications.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-display-color.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-display.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-filetype-association.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-font.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-gaming.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-icons.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-keyboard.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-launch-feedback.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-locale.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-mouse.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-notification-bell.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-notification.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-printer.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-screensaver.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-sound.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-text-to-speech.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-theme.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-user-password.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-user.png
	public_html/res/pnotify/oxygen/32/apps/preferences-desktop-wallpaper.png
	public_html/res/pnotify/oxygen/32/apps/preferences-plugin-script.png
	public_html/res/pnotify/oxygen/32/apps/preferences-plugin.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-bluetooth.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-login.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-network-sharing.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-performance.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-power-management.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-session-services.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-time.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-windows-actions.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-windows-move.png
	public_html/res/pnotify/oxygen/32/apps/preferences-system-windows.png
	public_html/res/pnotify/oxygen/32/apps/preferences-web-browser-adblock.png
	public_html/res/pnotify/oxygen/32/apps/preferences-web-browser-cache.png
	public_html/res/pnotify/oxygen/32/apps/preferences-web-browser-cookies.png
	public_html/res/pnotify/oxygen/32/apps/preferences-web-browser-identification.png
	public_html/res/pnotify/oxygen/32/apps/preferences-web-browser-shortcuts.png
	public_html/res/pnotify/oxygen/32/apps/preferences-web-browser-stylesheets.png
	public_html/res/pnotify/oxygen/32/apps/system-file-manager.png
	public_html/res/pnotify/oxygen/32/apps/system-software-update.png
	public_html/res/pnotify/oxygen/32/apps/system-users.png
	public_html/res/pnotify/oxygen/32/apps/utilities-desktop-extra.png
	public_html/res/pnotify/oxygen/32/apps/utilities-file-archiver.png
	public_html/res/pnotify/oxygen/32/apps/utilities-log-viewer.png
	public_html/res/pnotify/oxygen/32/apps/utilities-system-monitor.png
	public_html/res/pnotify/oxygen/32/apps/utilities-terminal.png
	public_html/res/pnotify/oxygen/32/emotes/face-angel.png
	public_html/res/pnotify/oxygen/32/emotes/face-embarrassed.png
	public_html/res/pnotify/oxygen/32/emotes/face-kiss.png
	public_html/res/pnotify/oxygen/32/emotes/face-laugh.png
	public_html/res/pnotify/oxygen/32/emotes/face-plain.png
	public_html/res/pnotify/oxygen/32/emotes/face-raspberry.png
	public_html/res/pnotify/oxygen/32/emotes/face-sad.png
	public_html/res/pnotify/oxygen/32/emotes/face-smile-big.png
	public_html/res/pnotify/oxygen/32/emotes/face-smile.png
	public_html/res/pnotify/oxygen/32/emotes/face-surprise.png
	public_html/res/pnotify/oxygen/32/emotes/face-uncertain.png
	public_html/res/pnotify/oxygen/32/emotes/face-wink.png
	public_html/res/pnotify/oxygen/32/places/bookmarks.png
	public_html/res/pnotify/oxygen/32/places/certificate-server.png
	public_html/res/pnotify/oxygen/32/places/document-multiple.png
	public_html/res/pnotify/oxygen/32/places/favorites.png
	public_html/res/pnotify/oxygen/32/places/folder-blue.png
	public_html/res/pnotify/oxygen/32/places/folder-bookmark.png
	public_html/res/pnotify/oxygen/32/places/folder-brown.png
	public_html/res/pnotify/oxygen/32/places/folder-cyan.png
	public_html/res/pnotify/oxygen/32/places/folder-development.png
	public_html/res/pnotify/oxygen/32/places/folder-documents.png
	public_html/res/pnotify/oxygen/32/places/folder-downloads.png
	public_html/res/pnotify/oxygen/32/places/folder-favorites.png
	public_html/res/pnotify/oxygen/32/places/folder-green.png
	public_html/res/pnotify/oxygen/32/places/folder-grey.png
	public_html/res/pnotify/oxygen/32/places/folder-html.png
	public_html/res/pnotify/oxygen/32/places/folder-image.png
	public_html/res/pnotify/oxygen/32/places/folder-important.png
	public_html/res/pnotify/oxygen/32/places/folder-locked.png
	public_html/res/pnotify/oxygen/32/places/folder-orange.png
	public_html/res/pnotify/oxygen/32/places/folder-print.png
	public_html/res/pnotify/oxygen/32/places/folder-red.png
	public_html/res/pnotify/oxygen/32/places/folder-remote.png
	public_html/res/pnotify/oxygen/32/places/folder-sound.png
	public_html/res/pnotify/oxygen/32/places/folder-tar.png
	public_html/res/pnotify/oxygen/32/places/folder-txt.png
	public_html/res/pnotify/oxygen/32/places/folder-video.png
	public_html/res/pnotify/oxygen/32/places/folder-violet.png
	public_html/res/pnotify/oxygen/32/places/folder-yellow.png
	public_html/res/pnotify/oxygen/32/places/folder.png
	public_html/res/pnotify/oxygen/32/places/mail-folder-inbox.png
	public_html/res/pnotify/oxygen/32/places/mail-folder-outbox.png
	public_html/res/pnotify/oxygen/32/places/mail-folder-sent.png
	public_html/res/pnotify/oxygen/32/places/mail-message.png
	public_html/res/pnotify/oxygen/32/places/network-server-database.png
	public_html/res/pnotify/oxygen/32/places/network-server.png
	public_html/res/pnotify/oxygen/32/places/network-workgroup.png
	public_html/res/pnotify/oxygen/32/places/repository.png
	public_html/res/pnotify/oxygen/32/places/server-database.png
	public_html/res/pnotify/oxygen/32/places/start-here.png
	public_html/res/pnotify/oxygen/32/places/user-desktop.png
	public_html/res/pnotify/oxygen/32/places/user-home.png
	public_html/res/pnotify/oxygen/32/places/user-identity.png
	public_html/res/pnotify/oxygen/32/places/user-trash.png
	public_html/res/pnotify/oxygen/32/status/appointment-recurring.png
	public_html/res/pnotify/oxygen/32/status/appointment-reminder.png
	public_html/res/pnotify/oxygen/32/status/audio-volume-high.png
	public_html/res/pnotify/oxygen/32/status/audio-volume-low.png
	public_html/res/pnotify/oxygen/32/status/audio-volume-medium.png
	public_html/res/pnotify/oxygen/32/status/audio-volume-muted.png
	public_html/res/pnotify/oxygen/32/status/dialog-error.png
	public_html/res/pnotify/oxygen/32/status/dialog-information.png
	public_html/res/pnotify/oxygen/32/status/dialog-password.png
	public_html/res/pnotify/oxygen/32/status/dialog-warning.png
	public_html/res/pnotify/oxygen/32/status/folder-open.png
	public_html/res/pnotify/oxygen/32/status/image-loading.png
	public_html/res/pnotify/oxygen/32/status/image-missing.png
	public_html/res/pnotify/oxygen/32/status/mail-attachment.png
	public_html/res/pnotify/oxygen/32/status/mail-forwarded.png
	public_html/res/pnotify/oxygen/32/status/mail-queued.png
	public_html/res/pnotify/oxygen/32/status/mail-read.png
	public_html/res/pnotify/oxygen/32/status/mail-replied.png
	public_html/res/pnotify/oxygen/32/status/mail-tagged.png
	public_html/res/pnotify/oxygen/32/status/mail-unread-new.png
	public_html/res/pnotify/oxygen/32/status/mail-unread.png
	public_html/res/pnotify/oxygen/32/status/media-playlist-repeat.png
	public_html/res/pnotify/oxygen/32/status/media-playlist-shuffle.png
	public_html/res/pnotify/oxygen/32/status/meeting-organizer.png
	public_html/res/pnotify/oxygen/32/status/object-locked.png
	public_html/res/pnotify/oxygen/32/status/object-unlocked.png
	public_html/res/pnotify/oxygen/32/status/script-error.png
	public_html/res/pnotify/oxygen/32/status/security-high.png
	public_html/res/pnotify/oxygen/32/status/security-low.png
	public_html/res/pnotify/oxygen/32/status/security-medium.png
	public_html/res/pnotify/oxygen/32/status/task-complete.png
	public_html/res/pnotify/oxygen/32/status/task-recurring.png
	public_html/res/pnotify/oxygen/32/status/task-reminder.png
	public_html/res/pnotify/oxygen/32/status/user-away-extended.png
	public_html/res/pnotify/oxygen/32/status/user-away.png
	public_html/res/pnotify/oxygen/32/status/user-busy.png
	public_html/res/pnotify/oxygen/32/status/user-offline.png
	public_html/res/pnotify/oxygen/32/status/user-online.png
	public_html/res/pnotify/oxygen/32/status/user-trash-full.png
	public_html/res/pnotify/oxygen/32/status/weather-clear-night.png
	public_html/res/pnotify/oxygen/32/status/weather-clear.png
	public_html/res/pnotify/oxygen/32/status/weather-clouds-night.png
	public_html/res/pnotify/oxygen/32/status/weather-clouds.png
	public_html/res/pnotify/oxygen/32/status/weather-few-clouds-night.png
	public_html/res/pnotify/oxygen/32/status/weather-few-clouds.png
	public_html/res/pnotify/oxygen/32/status/weather-freezing-rain.png
	public_html/res/pnotify/oxygen/32/status/weather-hail.png
	public_html/res/pnotify/oxygen/32/status/weather-many-clouds.png
	public_html/res/pnotify/oxygen/32/status/weather-mist.png
	public_html/res/pnotify/oxygen/32/status/weather-none-available.png
	public_html/res/pnotify/oxygen/32/status/weather-showers-day.png
	public_html/res/pnotify/oxygen/32/status/weather-showers-night.png
	public_html/res/pnotify/oxygen/32/status/weather-showers-scattered-day.png
	public_html/res/pnotify/oxygen/32/status/weather-showers-scattered-night.png
	public_html/res/pnotify/oxygen/32/status/weather-showers-scattered.png
	public_html/res/pnotify/oxygen/32/status/weather-showers.png
	public_html/res/pnotify/oxygen/32/status/weather-snow-rain.png
	public_html/res/pnotify/oxygen/32/status/weather-snow-scattered-day.png
	public_html/res/pnotify/oxygen/32/status/weather-snow-scattered-night.png
	public_html/res/pnotify/oxygen/32/status/weather-snow-scattered.png
	public_html/res/pnotify/oxygen/32/status/weather-snow.png
	public_html/res/pnotify/oxygen/32/status/weather-storm.png
	public_html/res/pnotify/oxygen/32/status/window-suppressed.png
Управление через АПИ каталогами. доставкой, методами оплаты
Управление через АПИ каталогами. доставкой, методами оплаты
visual fixes
visual fixes
Управление через АПИ каталогами. доставкой, методами оплаты
Управление через АПИ каталогами. доставкой, методами оплаты
Мерж ветки с Веселовым
Мерж ветки с Веселовым
Merge branch 'ua-pmatvienko' of https://github.com/pMatvienko/test into ua-dsemik

Conflicts:
	application/configs/i10n/ru.php
	application/configs/navigation/admin.yml
	application/configs/system/database.yml
	application/layouts/scripts/json.tpl
	library/Core/Grid/Html/Abstract.php
visual fixes
Merge branch 'ua-dsemik' of https://github.com/pMatvienko/test into ua-pmatvienko