Show trash
Merge branch 'master' of github.com:AEHO/mgm

* 'master' of github.com:AEHO/mgm:
  better sort/etc

Conflicts:
	src/components/index/VideoTabs.jsx