green tea totally counts as water intake. all herbal teas can... and there are so many tasty green tea blends at the moment.. it makes it so much easier to get your 2L.
For my daily intake:
when i get up - 750ml water
with brekkie - approx 200ml green tea
throughout work - 750 water
after work - 500 green tea
before bed - 250ml water
well thats on most days, i am not that good on the weekends..
saying that i feel much more hungry on the weekends