Merge branch 'master' of https://github.com/tlarrain/Magister

Conflicts:
utils/ASRUtils.pyc
Merge branch 'master' of https://github.com/tlarrain/Magister

Conflicts:
	utils/ASRUtils.pyc