Removed conflict crud
Merge branch 'master' into gh-pages