Moving modal dialog unobtrusive features into main file- half done
Modal diaogs: move attribute to settings conversion to core
resolved conflict
Fixing botched merge