Fixes the  Events 'Featured only' setting not followed, and Upcoming Events view didn't display event title [#910 state:resolved]
Fixes help link for mass mailer view
Adds category & tag assignment to multi-add photo items [#913 state:resolved milestone:2.1.2]
Disables 'quick upload' link/button during an upload to provide some feedback; fixes quick upload file dating for html5 browsers, updates changelogs [#899 state:resolved responsible:dleffler milestone:2.1.1]
Now actually deletes file on server when doing a batch delete from file manager
Merge branch 'develop' into feature/container2

Conflicts:
	CHANGELOG.md