* master: (121 commits)
Fix a POD typo.
correct inbox message from user preface
Fix a typo in the Default gallery view template
Documentation bug in buildArrayRefOfHashRefs
changed screenshots in Matrix Listing view to popup
matrix privileging fixes
Fix an i18n typo in the Post user defined variables.
Remove debugging code.
approval workflow fix
matrix upgrade and privileging fixes
fixed: Template parser cannot be set
forward porting gallery bug fixes
preparing for 7.7.0 dev
parser should be a selectbox, not a selectlist.
labeling survey as beta
fixeding my borkes to the changelog
fixed#9852: Users can accept private messages from Visitor, but Visitor cannot send messages
preparing for 7.6.14 release
fix AdSpace, Ad tests
Restore the original properties for the profile category that was modified for test.
...
Conflicts:
docs/gotcha.txt
docs/upgrades/upgrade_7.6.10-7.6.11.pl
lib/WebGUI/Asset/Wobject/Survey.pm
lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
7ec5cab126
