updating controllers
Merge remote-tracking branch 'origin'

Merging controller and model updates.