Support Module Options
Merge origin/master

Conflicts:
	config/module.config.php