added return movie
fixed population of editCustomerView
Merge branch 'master' into combined
Merge branch 'combined' of https://github.com/laughingMan/databaseProject into combined