un-modalify video details
Merge branch 'master' into video-details-redesign
clean up
Merge branch 'update-libraries' into video-details-redesign

Conflicts:
	app/states/video/video-details/index/slide-out-view.html
	bower.json
adding the locals
Merge branch 'master' into video-details-redesign
fixing searchz
Merge branch 'master' into video-details-redesign

Conflicts:
	app/components/video-list-item/video-list-item.html
	bower.json
Merge branch 'video-details-redesign'