[PTOUR-1]

Remove lots of BC-specific strings from sample Tour site.
Remove theme strings from module templates.
Merge remote-tracking branch 'upstream/master'