Add Comment Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/answers/add.php
Add Comment Update