adding masquerade and upgrading twitter block
Merge branch 'master' of github.com:civicrm/civicon