fix 'allow add options on vote' ability was not saving when create form
place delete option button closer to textarea on editForm page
Merge branch 'dev'
Merge branch 'master' into openshift_deploy