ok
Merge branch 'master' of https://github.com/LucTremblay/PerformanceAdaptSport

Conflicts:
	AppPAS_5694/helpers/assets_helper.php