service fixed. controller is still in trouble
Merge remote-tracking branch 'origin/master'