Merge pull request #44 from rowanseymour/master

Fix for HTML-413 (Identifier tag overwrites preferred identifier regardless of type)
removed unused variable declaration
[maven-release-plugin] rollback the release of 2.0.2
recommited changes to poms that were inadvertently rolled back
[maven-release-plugin] prepare release 2.0.3
[maven-release-plugin] prepare for next development iteration
HTML-416: the workflowState tag creates multiple program enrollments for a patient when it is used more than once on the same form
HTML-418: A duplicate program enrollment occurs if the patient is already enrolled in the program prior to the form being completed
HTML-344- avoid saving a HTML form when there are  required fields missing in <relationship> tag
Merge remote-tracking branch 'upstream/master' into HTML-344
HTML-344- merging with the latest repository version
[maven-release-plugin] prepare release 2.0.4
[maven-release-plugin] prepare for next development iteration
Merge remote-tracking branch 'ishara/HTML-344' into HTML-344
minor formatting: added a space in an exception message
HTML-424:  Form Schema Viewer fails if there are nested ObsGroup tags
HTML-425:  Nested obs groups are not removed or voided properly if the obs within them are removed or voided
HTML-426 - NPE when saving form with using Location referenced by SessionAttribute
HTML-427 - In the obs tag, specifying a blank or empty answerSeparator should be meaningful
HTML-427 - In the obs tag, specifying a blank or empty answerSeparator should be meaningful