UI Updates
Merge branch 'steve'
Merge branch 'master' of https://github.com/stoosevich/Symeetry

Conflicts:
	Symeetry.xcodeproj/project.pbxproj
comfirm