merged from AndroidBootstrap/android-bootstrap master