fixes some issues in edit/answering form
bumped version string
Merge branch 'release/2013-09.04' into develop