nothing to care
Merge branch 'master' of https://github.com/alanbasilio/gremlin-bootstrap

Conflicts:
	assets/js/libs/ui/i18n/jquery-ui-i18n.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ar-DZ.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ar.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-az.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-be.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-bg.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-cs.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-el.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-fa.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-he.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-hi.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-hy.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ja.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ka.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-kk.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-km.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ko.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ky.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-mk.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ml.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-pl.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ro.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ru.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-sr.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-ta.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-th.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-tj.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-tr.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-uk.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-vi.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-zh-CN.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-zh-HK.min.js
	assets/js/libs/ui/i18n/jquery.ui.datepicker-zh-TW.min.js