Merge branch 'master' of https://github.com/veslo1/lara_mar into pixeladmin

Conflicts:
	public/components/ckeditor/plugins/forms/icons/hidpi/textfield-rtl.png
	public/components/ckeditor/plugins/forms/icons/hidpi/textfield.png
	public/components/ng-ckeditor/libs/ckeditor/plugins/icons.png
	public/components/ng-ckeditor/libs/ckeditor/skins/moono/icons.png
	public/frontend/css/datetimepicker.css
	public/frontend/font/fontawesome-webfont.svg
	public/vendor/angular-bootstrap-datetimepicker/src/css/datetimepicker.css
	public/vendor/angular-file-upload/package.json
	public/vendor/angular-ui-router/src/urlMatcherFactory.js
	public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
	public/vendor/bootstrap/less/forms.less
	public/vendor/bootstrap/less/mixins/panels.less
	public/vendor/bootstrap/less/normalize.less
	public/vendor/bootstrap/less/print.less
	public/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
	public/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
	public/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
	public/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
	public/vendor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
	public/vendor/ckeditor/plugins/bidi/lang/af.js
	public/vendor/ckeditor/plugins/bidi/lang/ar.js
	public/vendor/ckeditor/plugins/bidi/lang/hi.js
	public/vendor/ckeditor/plugins/bidi/lang/ka.js
	public/vendor/ckeditor/plugins/bidi/lang/no.js
	public/vendor/ckeditor/plugins/codesnippetgeshi/plugin.js
	public/vendor/ckeditor/plugins/colorbutton/lang/ca.js
	public/vendor/ckeditor/plugins/colorbutton/lang/pl.js
	public/vendor/ckeditor/plugins/colordialog/lang/en.js
	public/vendor/ckeditor/plugins/flash/icons/flash.png
	public/vendor/ckeditor/plugins/flash/lang/eo.js
	public/vendor/ckeditor/plugins/flash/lang/hi.js
	public/vendor/ckeditor/plugins/font/lang/mn.js
	public/vendor/ckeditor/plugins/font/lang/uk.js
	public/vendor/ckeditor/plugins/forms/icons/button.png
	public/vendor/ckeditor/plugins/forms/icons/hidpi/textfield-rtl.png
	public/vendor/ckeditor/plugins/forms/icons/hidpi/textfield.png
	public/vendor/ckeditor/plugins/forms/lang/en.js
	public/vendor/ckeditor/plugins/forms/lang/ko.js
	public/vendor/ckeditor/plugins/forms/lang/no.js
	public/vendor/ckeditor/plugins/iframe/lang/et.js
	public/vendor/ckeditor/plugins/iframe/lang/ko.js
	public/vendor/ckeditor/plugins/justify/icons/hidpi/justifyright.png
	public/vendor/ckeditor/plugins/justify/lang/ca.js
	public/vendor/ckeditor/plugins/justify/lang/cs.js
	public/vendor/ckeditor/plugins/justify/lang/it.js
	public/vendor/ckeditor/plugins/justify/lang/sk.js
	public/vendor/ckeditor/plugins/liststyle/lang/ar.js
	public/vendor/ckeditor/plugins/mathjax/lang/fr.js
	public/vendor/ckeditor/plugins/mathjax/lang/gl.js
	public/vendor/ckeditor/plugins/mathjax/lang/no.js
	public/vendor/ckeditor/plugins/newpage/lang/en-ca.js
	public/vendor/ckeditor/plugins/newpage/lang/si.js
	public/vendor/ckeditor/plugins/newpage/lang/ug.js
	public/vendor/ckeditor/plugins/pagebreak/lang/eo.js
	public/vendor/ckeditor/plugins/pagebreak/lang/lt.js
	public/vendor/ckeditor/plugins/pagebreak/lang/ms.js
	public/vendor/ckeditor/plugins/pagebreak/lang/sq.js
	public/vendor/ckeditor/plugins/pagebreak/lang/tr.js
	public/vendor/ckeditor/plugins/preview/lang/it.js
	public/vendor/ckeditor/plugins/preview/lang/sl.js
	public/vendor/ckeditor/plugins/print/lang/ug.js
	public/vendor/ckeditor/plugins/save/lang/fr.js
	public/vendor/ckeditor/plugins/selectall/icons/hidpi/selectall.png
	public/vendor/ckeditor/plugins/selectall/lang/el.js
	public/vendor/ckeditor/plugins/selectall/lang/si.js
	public/vendor/ckeditor/plugins/showblocks/images/block_h6.png
	public/vendor/ckeditor/plugins/showblocks/lang/af.js
	public/vendor/ckeditor/plugins/showblocks/lang/sk.js
	public/vendor/ckeditor/plugins/smiley/images/devil_smile.png
	public/vendor/ckeditor/plugins/smiley/lang/fo.js
	public/vendor/ckeditor/plugins/smiley/lang/ms.js
	public/vendor/ckeditor/plugins/smiley/lang/sr-latn.js
	public/vendor/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
	public/vendor/ckeditor/plugins/sourcedialog/lang/cs.js
	public/vendor/ckeditor/plugins/sourcedialog/lang/mn.js
	public/vendor/ckeditor/plugins/sourcedialog/lang/nb.js
	public/vendor/ckeditor/plugins/sourcedialog/lang/zh.js
	public/vendor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
	public/vendor/ckeditor/plugins/templates/dialogs/templates.js
	public/vendor/ckeditor/plugins/templates/lang/nl.js
	public/vendor/ckeditor/plugins/templates/lang/zh-cn.js
	public/vendor/ckeditor/plugins/widget/lang/fa.js
	public/vendor/ckeditor/samples/inlineall.html
	public/vendor/ckeditor/samples/plugins/htmlwriter/outputhtml.html
	public/vendor/ckeditor/samples/plugins/toolbar/toolbar.html
	public/vendor/ckeditor/samples/uilanguages.html
	public/vendor/ckeditor/skins/kama/editor_iequirks.css
	public/vendor/jquery/src/core/init.js
	public/vendor/jquery/src/core/parseHTML.js
	public/vendor/jquery/src/var/indexOf.js
	public/vendor/jquery/src/wrap.js
	public/vendor/moment/LICENSE
	public/vendor/moment/locale/nl.js
	public/vendor/ng-ckeditor/examples/inlineall.html
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/icons.png
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/icons_hidpi.png
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/image2/dialogs/image2.js
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/link/images/hidpi/anchor.png
	public/vendor/ng-ckeditor/libs/ckeditor/plugins/specialchar/dialogs/lang/vi.js
	public/vendor/ng-ckeditor/libs/ckeditor/samples/ajax.html
	public/vendor/ng-ckeditor/libs/ckeditor/samples/index.html
	public/vendor/ng-ckeditor/libs/ckeditor/skins/moono/icons.png
	public/vendor/ng-ckeditor/libs/ckeditor/skins/moono/icons_hidpi.png