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'