Fixed create / edit election form issue
Merge branch 'development'