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 2256 (Tablet drag handling)
merge develop -D org: PR 2269 (ROI improvements)
merge develop -D org: PR 2336 (New tagging dialog)
merge develop -D org: PR 2357 (Generate Python API reference with Sphinx)
merge develop -D org: PR 2362 (Remove .jy from script names)
merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2403 (Send email)
merge develop -D org: PR 2411 (Update develop submodules)
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)
merge develop -D org: PR 2455 (Remove support for Ice 3.3)
merge develop -D org: PR 2484 (Maven/ant improvements)
merge develop -D org: PR 2510 (Update MATLAB examples for 5.0.x (rebased onto develop))
merge develop -D org: PR 2517 (EventLog Query (trac-12279) (rebased onto develop))
merge develop -D org: PR 2521 (Add 'config list' command)
merge develop -D org: PR 2527 (Bugfix: Remove FileAnnotations when multiple images are selected)
merge develop -D org: PR 2529 (fix upgrade scripts for PostgreSQL 8.4 compatibility)
merge develop -D org: PR 2534 (11286 ldap cce (rebased onto develop))
merge develop -D org: PR 2536 (Only enable the filepath icon if there are any filepaths to show)
merge develop -D org: PR 2538 (Wiki format (rebased onto develop))