Merge remote-tracking branch 'upstream/master'
Change ordering system for collections listing
Possible hotfix for mention worker
Possible fix for app trying to rotate images which don't need it
Hotfix for mention errors
Adjust collection sorting
Merge pull request #157 from robotmay/collection-sorting-adjustment

Hotfixes and collection sorting adjustment