Add filter modes for vehicle unlocks
Add filter options for weapon unlocks
Update changelog to include changes in #143 (to avoid conflict)
Merge remote-tracking branch 'origin/dev' into HEAD
Move cherry-picking code for weapon unlocks to the service
Extract common unlock code to AbstractUnlockSorter
Renamed class from AbstractUnlockSorter to just UnlockSorter
Merge pull request #144 from ninetwozero/add-filter-to-weapon-unlocks

Add filter to weapon and vehicle unlocks
Merged dev, and solved conflict on changelog