fixed strange merges
Merge branch 'develop' of github.com:senkz/HUSACCT into develop
fixed merge problem