Normalized edit fragments to use support libraries. Added edit story activity
Fixed merge conflicts