proposed concept queue proposed concept text did not get saved to
dictionary correctly - TRUNK-3593
Merge branch 'master' into TRUNK-3593
TRUNK-3804 - Merge Patients ignores visits
(also, increase memory when running unit tests)
Made small fix to search widgets not look up the selected item
from the array of results on click
Reverted the fix made to concept searching for - TRUNK-2705
Applied auto format changes
TRUNK-3732: Reverted change in PersonName.toString()
TRUNK-208: Added missing Transactional which fixed GPs not being updated
Merge pull request #17 from wluyima/TRUNK-3593

proposed concept queue proposed concept text did not get saved to dictionary correctly - TRUNK-3593
TRUNK-3486:typeMismatch error when saving concept
Applying auto format changes
TRUNK-3196: Create JUnit test for HibernateFormDAO.getFormCriteria's
containingAllFormFields parameter
Removed @Transactional from the interface
TRUNK-333:Remove concept_set_derived table
TRUNK-2651:Ugly stacktrace when trying to upload a non-image file as a
complex obs with the ImageHandler
Unit tests failing with JDK 1.7 - TRUNK-3142
Merge pull request #124 from dkayiwa/TRUNK-3142

Unit tests failing with JDK 1.7 - TRUNK-3142
[TRUNK-3734] - Add User Property convenience methods

[TRUNK-3734]- removed unnecessary  files and import statements.

[TRUNK-3734]- remove unused import.

[TRUNK-3734] - removed wildcard imports.

Follow up to apply changes after review - TRUNK-3734

Follow up to fix unit test - TRUNK-3734
Fixed @since values for userService.saveUserProperties methods -
TRUNK-3734
Remove not null constraint on the description column/property for all OpenmrsMetadata objects

TRUNK-3474
1. Added liquibase changeset for concept_class table to remove NOT NULL
   Constraint

2. ConceptClass.hbm.xml file
   Changed not-null="true" not-null="false"
 		<property name="description" type="java.lang.String"
			not-null="false" length="255" />

2. ConceptClassValidator class:
   - removed all code that rejects null/empty descriptions.
   - change:
       @should fail validation if description is null or empty or
whitespace TO
       @should pass validation if description is null or empty or
whitespace

3. ConceptClassValidatorTest class:
   - change test:
       public void
validate_shouldFailValidationIfAllRequiredFieldsHaveProperValues()
throws Exception {
      TO
       public void
validate_shouldPassValidationIfAllRequiredFieldsHaveProperValues()
throws Exception {

TRUNK-3474
Remove not null constraint on the description column/property for all
OpenmrsMetadata objects

TRUNK-3474
Remove not null constraint on the description column/property
patient_identifier_type.
Modified PatientIdentifierTypeValidator to not reject null/empty
descriptions.
PatientIdentifierTypeValidatorTest to pass if null/empty decription
found.

TRUNK-3474
Remove not null constraint on the description column/property on
privilege.
Modified PrivilegeValidator to not reject null/empty
descriptions.
PrivilegeValidatorTest to pass if null/empty decription
found.

TRUNK-3474
Remove not null constraint on the description column/property on
relationship_type table.
Remove not null constraint on the description column/property on
role table.
Modified RoleValidator to not reject null/empty descriptions.
Modified RoleValidatorTest to pass if null/empty decription
found.

TRUNK-3474
Remove not null constraint completely (was not-null="false") from
Hibernate mapping files.

TRUNK-3474
Removed not-null attribute for description in EncounterType.hbm.xml.