SWC-841 Added check for null when updating view from descriptor
Merge pull request #573 from heidiso/release-12

SWC-841 Added check for null when updating view from descriptor
log sweeping on
Merge pull request #574 from john-hill/PLFM-1592-c

log sweeping on
SWC-449 Gave widget editors access to submit button to disable/enable when appropriate
Merge branch 'swc_449' into develop
SWC-449 clean up code in widget editors
Merge pull request #576 from heidiso/develop

SWC-449 Gave widget editors access to submit button to disable/enable when appropriate
merged
Merge pull request #575 from john-hill/PLFM-1592-c

log sweeping on
SWC-853: cache version in footer
Merge pull request #578 from jay-hodgson/SWC-853

SWC-853: cache version in footer
promote synapse markdown processor
Merge pull request #579 from jay-hodgson/develop

SWC-733: Small change to make the switch. Promote Synapse Markdown Processor to the main stage.
renamed and set proxy
fix for build and added session id to log
Merge pull request #580 from john-hill/client-proxy-q

renamed and set proxy
Merge branch 'release-12' into develop

Conflicts:
	src/main/java/org/sagebionetworks/web/client/widget/entity/editor/AttachmentConfigEditor.java
SWC-855: performance improvement, use getEvaluationByContentSource
Merge pull request #581 from jay-hodgson/SWC-855

SWC-855: performance improvement, use getEvaluationByContentSource