FIXES SPOT-1389, SPOT-1391, SPOT-1393
Merge remote-tracking branch 'origin/new_work_temp' into merge

Conflicts:
	SpotSeeker/en.lproj/iPhone.storyboard
Merge branch 'master' into merge