add hulu
Resolve conflicts
Finalised support for Hulu