Changes to user controller and voting period model and controller
Merge remote-tracking branch 'origin/master'