Incorporating dbunit changes and updates to make sure app still runs.
Merging develop to master.