merged with dev, added some facebook and twitter buttons