Merge pull request #1026 from matty0ung/usability

Fix default file extension handling for XML export

Merge pull request #1020 from matty0ung/usability

Initial version of Merge feature

Merge pull request #1002 from matty0ung/usability

Fix missing ingredient signal connections, plus other tidy up

Merge pull request #986 from matty0ung/usability

Fix tree problems, add check for too-new DB schema, etc

Merge pull request #973 from matty0ung/usability

Fix for new water profiles etc not showing up in left-hand tree until prog restarted

Merge pull request #956 from matty0ung/usability

Show usage in recipes, plus finish removing parent-child stuff on ingredients

Merge pull request #931 from matty0ung/usability

Update change log

Merge pull request #927 from matty0ung/usability

Fix for crash on BeerJSON import

Merge pull request #914 from matty0ung/usability

Fix combo box crash when selected value is "child" record

Merge pull request #911 from matty0ung/usability

Fix for combo box assert on new recipe creation