Gradient view adjustments
Merge branch 'master' of github.com:AthensWorks/smap-ios

Conflicts:
	Smap/en.lproj/MainStoryboard.storyboard

what