Continue solving #846 and #851
Continue solving #846 and #851

TheCoder4eu/BootsFaces-OSP,TheCoder4eu/BootsFaces-OSP,mtvweb/BootsFaces-OSP,chongma/BootsFaces-OSP,mtvweb/BootsFaces-OSP,jepsar/BootsFaces-OSP,jepsar/BootsFaces-OSP,chongma/BootsFaces-OSP