Merge branch 'refs/heads/stable_plus'

Conflicts:
COPYRIGHT.php
admin/access_denied.php
admin/activate.php
admin/admin.php
admin/assessments.php
admin/browse.php
admin/cmdline_importsurvey.php
admin/conditions.php
admin/database.php
admin/dataentry.php
admin/dbedit.php
admin/deactivate.php
admin/deletesurvey.php
admin/dumpdb.php
admin/dumpgroup.php
admin/dumplabel.php
admin/dumpquestion.php
admin/dumpsurvey.php
admin/exportresults.php
admin/grouphandling.php
admin/html.php
admin/http_importsurvey.php
admin/importgroup.php
admin/importlabel.php
admin/importoldresponses.php
admin/importquestion.php
admin/importsurvey.php
admin/install/create-mysql.sql
admin/install/create-odbc_mssql.sql
admin/install/createdb.php
admin/install/index.php
admin/install/phpinfo.php
admin/install/upgrade-mysql.php
admin/install/upgrade-odbc_mssql.php
admin/integritycheck.php
admin/labels.php
admin/listcolumn.php
admin/login_check.php
admin/preview.php
admin/printablesurvey.php
admin/questionhandling.php
admin/results.php
admin/saved.php
admin/sessioncontrol.php
admin/spss.php
admin/statistics.php
admin/stats.php
admin/templates.php
admin/tokens.php
admin/usercontrol.php
admin/userrighthandling.php
admin/vvexport.php
admin/vvimport.php
classes/core/language.php
classes/core/sanitize.php
classes/core/surveytranslator.php
classes/php-gettext/gettext.php
classes/php-gettext/gettextinc.php
common.php
config-ldap.php
config.php
docs/demosurveys/sample_survey_v100.sql
docs/release_notes_and_upgrade_instructions.txt
group.php
images/flags/bs.png
images/flags/ca.png
images/flags/cs.png
images/flags/es-MX.png
images/flags/et.png
images/flags/eu.png
images/flags/mk.png
images/flags/sl.png
images/flags/sq.png
images/flags/sv.png
images/flags/th.png
images/flags/zh-Hant-TW.png
index.php
ldap-functions.php
load.php
locale/bs/LC_MESSAGES/bs.mo
locale/bs/LC_MESSAGES/bs.po
locale/ca/LC_MESSAGES/ca.mo
locale/ca/LC_MESSAGES/ca.po
locale/cs/LC_MESSAGES/cs.mo
locale/cs/LC_MESSAGES/cs.po
locale/da/LC_MESSAGES/da.mo
locale/da/LC_MESSAGES/da.po
locale/de-informal/LC_MESSAGES/de-informal.mo
locale/de-informal/LC_MESSAGES/de-informal.po
locale/de/LC_MESSAGES/de.mo
locale/de/LC_MESSAGES/de.po
locale/el/LC_MESSAGES/el.mo
locale/el/LC_MESSAGES/el.po
locale/en/LC_MESSAGES/en.mo
locale/en/LC_MESSAGES/en.po
locale/es-MX/LC_MESSAGES/es-MX.mo
locale/es-MX/LC_MESSAGES/es-MX.po
locale/es/LC_MESSAGES/es.mo
locale/es/LC_MESSAGES/es.po
locale/et/LC_MESSAGES/et.mo
locale/et/LC_MESSAGES/et.po
locale/eu/LC_MESSAGES/eu.mo
locale/eu/LC_MESSAGES/eu.po
locale/fi/LC_MESSAGES/fi.mo
locale/fi/LC_MESSAGES/fi.po
locale/fr/LC_MESSAGES/fr.mo
locale/fr/LC_MESSAGES/fr.po
locale/gl/LC_MESSAGES/gl.mo
locale/gl/LC_MESSAGES/gl.po
locale/hr/LC_MESSAGES/hr.mo
locale/hr/LC_MESSAGES/hr.po
locale/hu/LC_MESSAGES/hu.mo
locale/hu/LC_MESSAGES/hu.po
locale/it/LC_MESSAGES/it.mo
locale/it/LC_MESSAGES/it.po
locale/ja/LC_MESSAGES/ja.mo
locale/ja/LC_MESSAGES/ja.po
locale/no/LC_MESSAGES/no.mo
locale/no/LC_MESSAGES/no.po
locale/pt-BR/LC_MESSAGES/pt-BR.mo
locale/pt-BR/LC_MESSAGES/pt-BR.po
locale/ru/LC_MESSAGES/ru.mo
locale/ru/LC_MESSAGES/ru.po
locale/sl/LC_MESSAGES/sl.mo
locale/sl/LC_MESSAGES/sl.po
locale/sq/LC_MESSAGES/sq.mo
locale/sq/LC_MESSAGES/sq.po
locale/sr/LC_MESSAGES/sr.mo
locale/sr/LC_MESSAGES/sr.po
locale/sv/LC_MESSAGES/sv.mo
locale/sv/LC_MESSAGES/sv.po
locale/th/LC_MESSAGES/th.mo
locale/th/LC_MESSAGES/th.po
locale/tr/LC_MESSAGES/tr.mo
locale/tr/LC_MESSAGES/tr.po
locale/zh-Hans/LC_MESSAGES/zh-Hans.mo
locale/zh-Hans/LC_MESSAGES/zh-Hans.po
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po
qanda.php
question.php
register.php
save.php
scripts/calendar/lang/calendar-sq.js
survey.php
templates/basic/startpage.pstpl
templates/blue_heaven/startpage.pstpl
templates/bluengrey/startpage.pstpl
templates/bubblegum/startpage.pstpl
templates/business_grey/startpage.pstpl
templates/clear_logo/startpage.pstpl
templates/default/startpage.pstpl
templates/edgyblue/startpage.pstpl
templates/eirenicon/startpage.pstpl
templates/phpsurveyor/startpage.pstpl
templates/preview.pstpl
templates/softgreencurves/startpage.pstpl
templates/vallendar/startpage.pstpl
verification.php