implemented scrolling payperiod selector
Working on selecting from picker view
Merge remote-tracking branch 'origin'
blah
Merge remote-tracking branch 'origin/master'
fixing merge conflicts