+pom, +test (may be badly written), +applicationcontext, +tablescripts
Merge remote-tracking branch 'origin/master'