wip
Feature: rep edits answer
Merge branch 'master' of github.com:askaway/askaway into rep-edits-answer

Conflicts:
	app/assets/stylesheets/answers-expanded.css.scss
	app/views/questions/_answers.html.haml
Add integration test to edit answer.
Merge pull request #87 from askaway/rep-edits-answer

Rep edits answer