nevim
Merge branch 'master' of https://github.com/bouchja1/ltv

Conflicts:
	java/cz/cvut/fit/nutch/vidextractor/metaholder/impl/OpenGraphMetaManager.java
Jwplayer
JW player