modified:   resources/database/schema.mysql.sql
	modified:   resources/settings.xml
Merge branch 'master' of https://github.com/dudehere5/script.module.donnie

Conflicts:
	resources/settings.xml

	modified:   resources/settings.xml