merge new master menu into the TDD branch