tyrtyyt
qret
Merge branch 'master' of https://github.com/Isht/fo

Conflicts:
	assets/css/ui-ribbon.css
	assets/js/app/view/frontoffice/fodaftarbiasa/FoCaraBayarBiasa.js
	assets/js/app/view/frontoffice/fodaftarbiasa/FoDaftarBiasa.js
	assets/js/app/view/frontoffice/fodaftarbiasa/FoDaftarPemeriksaanBiasa.js
	assets/js/app/view/frontoffice/fodaftarbiasa/FoFormDaftarBiasa.js
	assets/js/app/view/ribbonmenu/FrontOffice.js
	assets/js/ext/resources/js/azzurra.js