Resolved merge conflict
Merge branch 'master' of https://github.com/st3fan/minion-backend