Initial repo creation
Added H2 test database, dbunit
Resolving conflicts