Refactor dependency on process-control from model.  move tests
appropriately
Merge branch 'master' of
https://sfdc-hhildebrand@github.com/sfdc-hhildebrand/Army-Of-Darkness.git

Conflicts:
	model/src/test/java/com/salesforce/aod/model/ModelTest.java