Manually resolved conflicts in:
	application/config/version.php
	application/controllers/admin/tokens.php
	application/controllers/survey/index.php
	application/helpers/admin/export/Writer.php
	application/helpers/common_helper.php
	application/helpers/expressions/em_manager_helper.php
	application/helpers/qanda_helper.php
	application/helpers/update/updatedb_helper.php
	application/models/Token.php
	installer/sql/create-mssql.sql
	locale/_template/limesurvey.pot
	locale/de-informal/LC_MESSAGES/de-informal.mo
	locale/de/LC_MESSAGES/de.mo
	locale/el/el.mo
	locale/es/es.mo
	locale/nl-informal/LC_MESSAGES/nl-informal.mo
	locale/nl/nl.mo
	locale/pl/LC_MESSAGES/pl.mo