Switched to HashMultimap
Fixed weird indents
Fixed wrong import
Fixed various minor things
OmeroCpp: Correct stringstream usage in cmdcallbacktest
OmeroCpp: Correct use of rbool
Merge pull request #2265 from dominikl/rebased/develop/move_image_in_plate

Don't show MoveToAction when WellSampleData is selected (rebased onto develop)
Merge pull request #2263 from joshmoore/rebased/develop/imagej-omero-0.1.0

Minor adjustments for imagej-omero (rebased onto develop)
Remove commented out import
Merge pull request #2251 from knabar/flake8-gateway

omero gateway flake8 cleanup: Fix failures and warnings
Merge pull request #2243 from knabar/flake8-cleanup-unused-imports

omeroweb flake8 cleanup: unused imports
customizing 'Orphaned images' container
add comment to settings.py
fixing custom template tag for retrieving settings

to display empty string instead of None
updating year in copyrights & spelling mistake
introducing hidden settings
Merge pull request #2257 from aleksandra-tarkowska/webstart_index_template2

Webstart index template2
travis: Split build logic into a separate script
merge develop -D org: PR 2127 (Working view to email announcements to selected users, groups, email addresses and/or all users)
merge develop -D org: PR 2165 (Inplace file path)