added files
Merge branch 'master' of https://github.com/addwittz/mm-base

Conflicts:
	css/settings.css
	includes/common.php
	includes/settings.php
	js/settings.js
	uninstall.php