merge theoles:master with nick:master

this updates the next show and show dates tabs.