fix author and feeds
Merge branch 'radiotube' into theradiocc

Conflicts:
	templates/base.html