Merge branch 'master' into develop
Merge branch 'master' into develop
update to v0.3a
Fixed issuse with prefBillDate not being stoed correctly
Merge branch 'develop'