up date 27 sept 2014

combining applying bootstrap and master