Added location, landscape layouts, trying to push to ipad
Merged conflicts
Merge pull request #778 from stowellm/goat

landscape, location manager, trying to push to ipad