Fixing use of display condition in menus
Merge branch '3.0' of git://github.com/thecodingmachine/html.template.bootstrap into 3.0