Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml

Revert "M"

This reverts commit
96c83a69bf4e1e6b89d51c9ea4ec9130b05a330d.
Merge branch 'master' of https://github.com/Mflm/MexiMedia