Merge branch 'master' of https://github.com/icalvete/puppet-mysql

Conflicts:
	README.md
Merge branch 'master' of https://github.com/icalvete/puppet-mysql

Conflicts:
	README.md