Merge branch 'master' into ext-perl

diff --cc configure.ac
Simple merge

diff --cc src/dsp_mainwindow.c
Simple merge

diff --cc src/hb-account.c
Simple merge

diff --cc src/hb-archive.c
Simple merge

diff --cc src/hb-assign.c
Simple merge

diff --cc src/hb-category.c
Simple merge

diff --cc src/hb-payee.c
Simple merge

diff --cc src/hb-preferences.c
Simple merge

diff --cc src/hb-preferences.h
Simple merge

diff --cc src/hb-tag.c
Simple merge

diff --cc src/hb-transaction.c
Simple merge

diff --cc src/hb-xml.c
Simple merge

diff --cc src/homebank.c
Simple merge

diff --cc src/homebank.h
Simple merge

diff --cc src/ui-pref.c
Simple merge

diff --cc src/ui-pref.h
Simple merge

diff --cc themes/hicolor/Makefile.am
index f5ac1b75129045428bb726d2d9852f83be3d8b84,39cd3ec090f72fde43c20a20e795bde237c2c1b7..91ced1bb5e66320fa97f5e7cc4c8daef952dd75e
--- 1/themes/hicolor/Makefile.am
--- 2/themes/hicolor/Makefile.am
+++ b/themes/hicolor/Makefile.am
@@@ -78,8 -78,9 +78,10 @@@ private_icons = 
        hicolor_status_48x48_prf-import.png \
        hicolor_status_48x48_prf-interface.png \
        hicolor_status_48x48_prf-report.png \
 +      hicolor_status_48x48_prf-plugins.png \
        hicolor_actions_scalable_toggle-sign-symbolic.svg \
+       hicolor_actions_scalable_btn-collapse-symbolic.svg \
+       hicolor_actions_scalable_btn-expand-symbolic.svg \
        $(NULL)