Add DaveController and Tests
merging
merging