Merge "Adding intent generation for dates and flights"