solve alloy module
Merge branch 'solve_alloy_model'

Conflicts:
	Manifest.txt