API fixes, added missing python wrappers
Revert previous changes to QgsLegendModel and its items
More Python wrapper updates + fixes
Added header to new files
Fix #11006 (wrong size of symbols in print composer legend if map units are used)
Followup fix for #11006 (spotted by Nyall - thanks)
Fix doxygen warnings, fix missing bindings
[composer] Add zoomToExtent for QgsComposerMap, allows easily fitting a set extent into the map item without altering the item's shape
[map layer actions] action for group of features, rename availability to target (flags), only emit signal for defined target"

Conflicts:
	src/gui/qgsmaplayeractionregistry.cpp
	src/gui/qgsmaplayeractionregistry.h
indentation update, Q_FOREACH support in astyle, doxygen fix
german translation update
[SIP] add missing operator for flags
more flag operators declaration in SIP, better use of flags in data defined button
[composer] Support drag and drop restacking of items via item panel (fix #11058)
new edit widget for date/time capable of setting null dates
added new QgsDateTimeEdit to custom widgets
SIP file for new date time edit
more const correctness
[heatmap-plugin] replace messagebar to messagebox
[context-help] set heading to 3 for heatmap plugin and python console help file