Merge branch 'em_deleteorder'
Removing WebAndPeople text
Merge branch 'cleanup' into devsite