#4 changed wp_test_db
#4 conflict dbprocs/wp_test_db.sql resolved
Merge branch 'oasban.#4.dvlp' into test