Revert "App now has a separate container view"

Conflicts:
	WatchSimulator.xcodeproj/project.pbxproj
	WatchSimulator/AppViewController.swift
	WatchSimulator/Base.lproj/Main.storyboard