Merge pull request #116 from eklyman/master

works on add site modal
AddSite and Edit modals work