update plans page to include both yearly and monthly terms
Merge remote-tracking branch 'origin/master'