Can you do free travel between Shanghai and Beijing

Arriving on a Sunday and taking train to Beijing and back and leave the following Saturday (6 Days).
Can you travel between the two cities without a visa now?

Also, how long does the application process take at the airport?
I have a tight time schedule to make my train when I arrive.
Thank you.