Merge pull request #1254 from Arantor/release-2.1

Fix (some of) all the things!
Merge pull request #1255 from Arantor/release-2.1

! Add CAD and AUD to the list of supported currencies. This will (hopefu...
! The user ID isn't used in the pm_labeled_messages table, causing an error...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1256 from Oldiesmann/release-2.1

! The user ID isn't used in the pm_labeled_messages table, causing an error