working mainstoryboard
Made labels & buttons all 'plain'
Merge branch 'nick-UX'

Conflicts:
	sling/Base.lproj/Main.storyboard