Merge branch '206-engineering-verification' of github.com:solarpermit/solarpermit into 206-engineering-verification

Conflicts:
	functional-tests/api/case/690_12.xml
	functional-tests/api/case/690_15_D_Pass.xml
Merge branch '206-engineering-verification' of github.com:solarpermit/solarpermit into 206-engineering-verification

Conflicts:
	functional-tests/api/case/690_15_D_Pass.xml