Fully updated

move from bootstrap2 to boostrap3