Merge branch 'develop' of https://github.com/Sage-Bionetworks/SynapseWebClient into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/SynapseWebClient into develop

Conflicts:
	src/main/java/org/sagebionetworks/web/client/presenter/SearchPresenter.java
Merge branch 'develop' of https://github.com/Sage-Bionetworks/SynapseWebClient into develop
Merge branch 'develop' of https://github.com/xschildw/SynapseWebClient into develop
Fix rendering for an entity be used multiple times SWC-580
first start on moving multi-level used elements out to the right...
SWC-447 - add edit and delete permission option to ACL editor
remove comment
Merge pull request #317 from dburdick/swc-580

Fix rendering for an entity be used multiple times SWC-580
Merge branch 'SWC-471' into SWC-471-patch
SWC-471: fix build (merge issue)
update pom to 1.24 PLFM artifact
update pom
Merge pull request #319 from jay-hodgson/SWC-471-patch

Swc-471 patch merged up from develop
SWC-584: re-expose promote version.  also fix a page refresh issue
Merge pull request #320 from jay-hodgson/SWC-584

SWC-584: re-expose promote version.  also fix a page refresh issue
Additional fixes for SWC-450 (prompt save), SWC-324/325 (blank owner entry), and SWC_447
add owner linet to test
Merge pull request #321 from dburdick/swc-447

SWC-447, SWC-450, SWC-325, SWC-234
Merge branch 'release-1.25' into develop