wagn 1.14 polishing

added follow specs, removed 'save_draft' action, fixed view for conflicts