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
Merge pull request #574 from john-hill/PLFM-1592-c

log sweeping on
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
SWC-856 Fixed
SWC-856 Clean up code for the wiki's image editor
SWC-856 Modify the handling of buttons for wiki's image editor
compression test
add newline at end of files
Merge pull request #583 from jay-hodgson/release-13

compression filter test
modify compression filter
Merge pull request #584 from jay-hodgson/release-13

modify compression filter
Merge pull request #582 from heidiso/release-13

SWC-856 Fixed disabled submit buttons for tabs in the insert image dialog
promote reference widget out. bookmark needs to be tested...