Fix active organization layout
Merge branch 'master' of git://github.com/ESCAMBO/escambo-theme