# [#30349] Cleaned up use of database & query objects. Thanks Peter van
Westen and Michael Babker
(Fix #856)
Merge branch 'master' of https://github.com/joomla/joomla-cms into davidsbranch

Conflicts:
	libraries/cms/tags/tags.php
 # [#30454] Tags: Adding Tags via Batch function replaces all previous
tags. Thanks David and Elin. (Fix #936)
 # [#30463] Missing closing div in compact tag layout. Thanks Thomas
Hunziker and Constantin Romankiewicz
(Fix #942)
 # [#30464] ACL Undefined variable error in contentadministrator.php on
line 112. Thanks Constantin Romankiewicz 
(Fix #944)
 # [#30062] Base Item option in mod_menu has no effect [regression].
Thanks René Alain Erichsen
(Fix #710)
 # [#30422] Tags drill down incorrectly finds match to multi-tag tagged
items menu item. Thanks Mark
work in progress
 # [#30210] Undefined index errors by using the style 'beezTabs' at an
beez template. Thanks Constantin Romankiewicz
 # [#30444] Newfeeds Hide icon wrong colour
 # [#30450] Remove moduleclass suffix from <input> and <button> elements
in mod_search. Thanks Thomas Hunziker
(Fix #929)
 # [#29377] Image select. Thanks Constantin Romankiewicz (Fix #848)
 # [#29961] RAW filter is missing for JInput. Thanks Cedric Keiflin
(Fix #658)
 # [#30427] Remove 1.5 html methods from com_newsfeeds. Thanks Elin
(Fix #913)
 # [#30430] Severe bug with "com_content" component routing. Thanks
sajal soni and Elin.
Merge branch 'master' of https://github.com/joomla/joomla-cms into davidsbranch

Conflicts:
	libraries/cms/helper/tags.php
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch

Conflicts:
	libraries/cms/ucm/base.php
clean up some typos
More work in progress and two new helper methods
Merge pull request #2 from elinw/davidsbranch

Merging Elin's Latest Work