day 11 comitt for merge
Merge remote-tracking branch 'origin/master' into BeaconBranch

day 11 comitt for merge
day 12 storyboard changes to tab bar controllers, and add prices to billing
day 12 push with origin master changes, bug fixes from bill