Edit contact is now a pop-up
Merge branch 'master' of https://github.com/Chrisisar/GoyelloFCGBasics

Conflicts:
	AddressBook/Scripts/AddressBook/ShowContactList.js
	AddressBook/Views/AddressBook/_AddOrEditContact.cshtml