Merge branch 'master' of github.com:onepercentclub/bluebottle
updated static files to latest CSS version
Modified base template, take out some errors causing 404's
updated test_files to make tests pass again
Add alternative settings to make test debugging easier
moved some files around
tests are passing again
Added splinter requirement for tests
Missing module
another missing module
dependency
dependency...
Merge branch 'fix-tests-after-css-rewrite' of github.com:maykinmedia/bluebottle into sergeis-requests

Conflicts:
	bluebottle/common/templates/bluebottle/base.html