merging ajax branch
removing ec2 files