merge bootstrap
re-add localeapp