fixes
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration