@NO test change modules xml
Merge branch 'master' of https://github.com/lafalex/alex-config

Conflicts:
	badges.xml