Client: gruntfile fixes after folder changes, app-controller jshint fixes