monthly fee in the wrong place. fix it.
Merge branch 'development' into staging
Merge branch 'staging'