Fixed routing confusion with post editing
Updated composer lock file
fix double class declarations
Merge pull request #143 from stiggg/cancel-commenting

cancel button on comment reply closes the comment form
Fixed merge conflicts