added follow specs
turned off html diff
removed 'save_draft' controller action
added diff for conflicts