filtering
Merge branch 'feature/filtering' into video-play

Conflicts:
	www/index.html
Merge branch 'video-play' of github.com:mykebates/quipvid-mobile into video-play