Integrated edit flow
Merge branch 'master' of https://github.com/vharnath/Pristine