WiP
Merge branch 'FMA' of github.com:breach/breach_core into FMA

Conflicts:
	lib/module_manager.js