added GA, View Controller, & infrastructure stuff
sync master with edm branch