Merge changes from Evote-UI 2013

Todo: update sample