Merge branch 'master' into usability

Conflicts:
	bme2/src/main/java/medizin/client/ui/view/QuestiontypesEditViewImpl.java
	bme2/src/main/java/medizin/client/ui/view/QuestiontypesEditViewImpl.ui.xml
	bme2/src/main/java/medizin/client/ui/view/question/QuestionEditViewImpl.java
	bme2/src/main/java/medizin/shared/i18n/BmeConstants.java
	bme2/src/main/resources/medizin/shared/i18n/BmeConstants.properties
	bme2/src/main/resources/medizin/shared/i18n/BmeConstants_en.properties
	bme2/src/main/resources/medizin/shared/i18n/BmeContextHelpConstants.properties
Merge branch 'master' into usability

Conflicts:
	bme2/src/main/java/medizin/client/ui/view/QuestiontypesEditViewImpl.java
	bme2/src/main/java/medizin/client/ui/view/QuestiontypesEditViewImpl.ui.xml
	bme2/src/main/java/medizin/client/ui/view/question/QuestionEditViewImpl.java
	bme2/src/main/java/medizin/shared/i18n/BmeConstants.java
	bme2/src/main/resources/medizin/shared/i18n/BmeConstants.properties
	bme2/src/main/resources/medizin/shared/i18n/BmeConstants_en.properties
	bme2/src/main/resources/medizin/shared/i18n/BmeContextHelpConstants.properties