StoryBoard update
Merge remote-tracking branch 'origin/master'
change to dynamic cost per hour
Merge remote-tracking branch 'origin/master'
Fixed picker
Merge remote-tracking branch 'origin/master'