fixes for Biel
Merge branch 'master' into heroku
added basel colors