Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	submodules/dslv
Merge branch 'develop'
Removed mp4 chapter support
Merge branch 'develop'