added create answer form
Merge branch 'master' into mcarthur