Don't show mini attachments on single event view (since they're shown in full anyway).
Make this a quiet comment not a loud one
Testing mode banner and better login choice page
Handle some bits which don't work in testing mode
Merge branch 'demo' into iap
Import entry reqs from CSV and show entry req block on course home page
Better icon for entry reqs block
Entry Requiements on Applications
Entry requirements with tab!
Filling in of entry requirements on applications!
Deletable entry req mets
Add the extra customisable entry reqs
Cancel the no but box
BKSB Import
Message about old settings
Drop old unused settings
Slightly nicer on settings
Merge branch 'iap'

Conflicts:
	config/initializers/settings.rb
Merge branch 'bksb'

Conflicts:
	app/views/admin/settings/index.html.haml
Merge branch 'master' of github.com:sdc/leap