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

Conflicts:
	vue.py