Another major UI Update
Merge branch 'steve'

Conflicts:
	Symeetry.xcodeproj/project.pbxproj