Added MariaDB - a MySQL replacement
Merge pull request #114 from Ilyes512/added-mariadb

Added MariaDB - a MySQL replacement
Merge branch 'develop'
Merge branch 'master' into theand

Conflicts:
	Vagrantfile