Most of the dialogs are now working
Ok this has the dialogs and everything sorted out again. no if there are no more merge problems. It also mostly nukes the master page and all sub pages still link to it, but hte master pages is just a include for the body.
Merge branch 'master' of github.com:mtrebell/315

Conflicts:
	Admin/AddToDataBase.aspx
	MainPage.aspx