Merge branch '8.5-SNAPSHOT' of github.com:luisromangz/sir-geoexplorer-base-js into 8.5-SNAPSHOT
Merged changes from upstream.
Merged changes from upstream.
Merged changes.
Merged changes from upstream (again...)
Merge branch '8.5-SNAPSHOT' of github.com:Emergya/sir-geoexplorer-base-js into 8.5-SNAPSHOT

Conflicts:
	SelectFeatureAction.js
	widgets/EditionToolbar.js