core structure and accounting module bugfixing
Merge remote-tracking branch 'origin/master'