Production merge to master

Added twitter-bootstrap and jQuery