Feature/social

updating master with the facebook social feature