Add messages to login page to setup navbar correctly
Upgrade Twitter Bootstrap to 2.3.1
Revert "Upgrade Twitter Bootstrap to 2.3.1"

This reverts commit 96f3d24ea86789266268e850214ce4aab4d8a10e.
Merge remote-tracking branch 'upstream/master'
Fix link to bootstrap.min.js on cdnjs
Revert "Revert "Upgrade Twitter Bootstrap to 2.3.1""

This reverts commit bf02c02d7d070e2eb6c3d60c2d9ffc914d7ffebf.
Merge branch 'bootstrap231'
Merge remote-tracking branch 'upstream/master'