Samuel Georges a548d6ee56 Merge remote-tracking branch 'remotes/origin/stable' into develop
Conflicts:
	modules/backend/lang/en/lang.php
	modules/backend/lang/fr/lang.php
2016-04-01 13:00:32 +11:00
..