Merge branch 'hotfix/HerokuLaboqProblems' into develop

* hotfix/HerokuLaboqProblems:
  visability-hidden
  Fix header html
  Resolve header conflict
Merge branch 'hotfix/HtmlSafeCategoryList' into develop

* hotfix/HtmlSafeCategoryList:
  Html_safe for links and category list visualisation
  Try to repair heroku production
Bootstrap3 in admin panel is work now
Admin integrated with simple_form + bootstrap3
Merge branch 'feature/AdminkaFixBug' into develop

* feature/AdminkaFixBug:
  Admin integrated with simple_form + bootstrap3
  Bootstrap3 in admin panel is work now
Merge branch 'release/AdminkaBootstrap3'

* release/AdminkaBootstrap3:
  Admin integrated with simple_form + bootstrap3
  Bootstrap3 in admin panel is work now