Merge pull request #506 from dpwrussell/ldap-filters

Ldap filters
Merge pull request #505 from joshmoore/rebased/develop/script_sample_gh-470

Script sample gh 470 (rebased onto develop)
Merge pull request #502 from manics/rebased/develop/remove_nonexistent_annotations

Fix list of Annotations (rebased onto develop)
merge develop -D org -I include -E exclude: PR 450 (omero: Python 2.6 is the minimum supported version)