changes on index page + fix in video-info-retrieve script
Merge branch 'index-changes' into develop

Conflicts:
	website/app/controllers/VideoController.java
	website/app/models/Video.java
	website/public/js/video-info-retrieve.js
Merge remote-tracking branch 'origin/develop' into develop
filter by date + separate output of videos and notes