Merge branch 'hotfix/fixAndCondition'
Merge branch 'develop'
Merge branch 'develop'
Months till deficit calculations should factor in average account expenses.
* fix: now check for possible manual merges on our associated data.
0.3.1
Merge branch 'hotfix/tempAssociationWorkaround' into develop