added hasError param to most BootstrapHTMLGenerator functions
merge