Fixed security error for twitter widget
Added isVideo class to item and added video to modal
Fixed security error for twitter widget
Fixed merge conflicts
No actual changes, git being weird
Merge branch 'detached'

Conflicts:
	css/less/app.less
	index.html