picked 994f2995a4620373469f2e7ef34a579ae25c8bb3 from geersch remote
adapts previous commit for requirements of bootstrap 3 and FF