Merge branch 'sf-master' into refactor/lfsitemerge

Conflicts:
	src/angular-app/common/css/palaso-ui.css
	src/angular-app/common/js/services.js
	src/angular-app/common/js/tagging.js
	src/angular-app/sfchecks/partials/questions.js
	src/models/dto/RightsHelper.php
	src/models/dto/UsxHelper.php
	src/service/sf.php
	test/php/AllTests.php