Merge branch 'gsolbeck-development' into development: multi-word tag, analytics parsing