journal entry 1493
text tweaks
updated information
text tweaks
delete temp files
text tweak
published 1494
Merge remote-tracking branch 'upstream/master'

Conflicts:
	journal/channel.txt