Add a basic tag switching menu
Merge remote-tracking branch 'upstream/master' into masterMerge