merged changes with the root fork of BootsFaces