updated for controller
Merge branch 'master' of https://github.com/iamlalit/olympia-volunteer