Fixed move module, trello https://trello.com/card/reimplement-move/51ba80289fc7cf710e002196/20
Merge remote-tracking branch 'origin/master'