Merge branch 'master' into marty
Merge branch 'master' into marty
Changed button behavior on customer create screen to edit after successful creation
Merge branch 'marty'
Merge branch 'master' into marty
Revert ad31bca..9e90c0f

This rolls back to commit ad31bcaa4f021d66d2b14b756d8e687e311eaa79.
Merge branch 'master' into marty
Revert "Merge branch 'master' into marty"

This reverts commit 4751bc83298b2b56c0027dc900fde56a9531ec01, reversing
changes made to 2bbfadfed155a6b67ff3ceb32dbcb27e4249bb56.
Merge branch 'marty'
Merge branch 'Dustin'

Conflicts:
	main.wire
Merge branch 'master' into Dustin