bootstrap3: move static and templates back to main app

While in theory would be cool to support multiple bootstrap version
in practice it's not.
First bootstrap upstream support only one version at time, then the
name already clashes with at least another django application.
README: bootstrap3 application is not required anymore
Upgrade bootstrap to 3.3.0
Update CHANGELOG
Update bootstrap to 3.3.1
Add missing semicolon
Update CHANGELOG
bootstrap: cleanup indentation in search_form
bootstrap: make the inner navbar responsive

We just make it collapsable and make sure we don't clash with the top one.

Fixes #144
Update CHANGELOG
Bump version to 2.2.0
Merge remote-tracking branch 'upstream/master'