info and chap
Merge remote-tracking branch 'origin/hotspot' into hotspot

Conflicts:
	controllers/video.js