TRUNK-4406: Remove duplicate keys from message resource files

TRUNK-4406: Remove duplicate keys from message resource files - hindi

TRUNK-4406: Remove duplicate keys from message resource files hi

TRUNK-3064: Create unit test for duplicate messages
Merge pull request #978 from akolodziejski/TRUNK-4406

TRUNK-4406: Remove duplicate keys from message resource files
TRUNK-3064: Create unit test for duplicate messages

TRUNK-3064: Create unit test for duplicate messages

TRUNK-3064: Create unit test for duplicate messages

TRUNK-3064: Create unit test for duplicate messages
TRUNK-4389 Added orderType check
Merge pull request #976 from akolodziejski/TRUNK-3064

TRUNK-3064: Create unit test for duplicate messages
Ignoring the randomly failing ModuleActivatorTest method - TRUNK-4418
TRUNK-2136: merge & cleanup of 2nd round commit
Merge branch 'master' of ssh://github.com/vencik/openmrs-core

Conflicts:
	api/src/main/java/org/openmrs/obs/ComplexObsHandler.java
	api/src/main/java/org/openmrs/obs/handler/BinaryDataHandler.java
	api/src/main/java/org/openmrs/obs/handler/BinaryStreamHandler.java
	api/src/main/java/org/openmrs/obs/handler/ImageHandler.java
	api/src/main/java/org/openmrs/obs/handler/TextHandler.java
TRUNK-2136: automatic indentation