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

Conflicts:
	NOTES
	module/package.json