industry
Merge branch 'master' of https://github.com/jmayhew/wpf

Conflicts:
	Expressions_Industry/js/expressions_industry.js