Add important stuff
Update and delete action on comments, sort comments, update state_machine
Add tweetable comment :metal:
Merge branch 'feature/important_stuff' into develop