Few More Fixes

few fixes

i) added year to calculateDuration method to support billing cycle
duration exceeding 12 years.
ii) modified makeStartStopDates method to include plans assigned today
only.