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
Fixed issues where the synonym and other data dont get saved -
TRUNK-3593
Follow to ensure we dont add the proposal several times - 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
Follow up to get make sure duplicate synonyms and obs are not created -
TRUNK-3593