Merge branch 'nick-UX'
merging nick-UX with master
Conflicts:
	sling/Base.lproj/Main.storyboard
Merge branch 'master' of https://github.com/achad4/sling
merging local branch and remote master