Added edit dropdown values
Changed up ajax call so they will work on GoDaddy
Merge branch 'master' of C:/project

Conflicts:
	SOAP/SOAP/Scripts/Control.js
Merge branch 'master' of C:/project

Conflicts:
	SOAP/SOAP/Scripts/Control.js
commit orig
Got rid of UserId Column in ASF_User and Membership Table
Fixed issues with deleting UserId from Membership and ASFUser tables. Now working
Fixed issues with routing
Merge branch 'dev'