Fixed merge error
Support for youtube trailer search
Support for sorting on size, date and name
Revision 0.2.5