Stashing
Merge branch 'master' of https://github.com/allevitan/olinbartering
Merge branch 'master' of https://github.com/allevitan/olinbartering
Bulletin resolve functionality fix.