2 day stop in Beijing

Hi guys,

I'm travelling from the UK to China, stopping with a friend in Beijing for 2 days then flying to Tokyo.

And on the way back I'm stopping in Beijing for 4 hours before flying back to the UK.

Do I need a Visa for this and if not what documents do I need?