Feature/upgrade bootstrap

Added IhabSoliman's BS3 solutions