Fix DirectoryDaoTest.
Add EXPECT_QSTRING_EQ and ASSERT_QSTRING_EQ helpers.
Merge branch 'master' into master_sync