OC-5896

    Inconsistencies in date/time representation in OpenClinica UI
    Recording of Notes & Discrepancies Date Created, Date Updated
Merge branch 'master' into OC-5896

Conflicts:
Resolved	core/src/main/resources/migration/3.4/release.xml
Reverting id change so development envs don't get effected.
Merge pull request #28 from jkeremian/OC-5896

 OC-5896: Recording of Notes & Discrepancies Date Created, Date Updated