Commit: Details XML GONE edit Buttons
Merge remote-tracking branch 'origin/master' into master-kevin