Merge branch 'master' into Dustin
Edit modal class and actions
Merge branch 'Dustin'

Conflicts:
	main.wire
resolving conflicts
Merge branch 'master' into marty