Handling the unsupported video format
Merge branch 'master' of github.com:ranjithnalimela/sideline

* 'master' of github.com:ranjithnalimela/sideline:
  caption redirect issue fixed
  remove fb share code
Merge branch 'master' of github.com:ranjithnalimela/sideline

# By ranjithnalimela (6) and venkatasubbaiah (2)
# Via ranjithnalimela
* 'master' of github.com:ranjithnalimela/sideline:
  changed deployment.rb
  added mini magick insted of rmagick
  Fixed teh changes in GIF Image create
  share issues fixed
  added condition for meta tags
  changed image meta tag
  added meta tags for share
  Handling the Unsupported video formats.

Conflicts:
	app/controllers/videos_controller.rb
Merge branch 'master' of github.com:ranjithnalimela/sideline

# By ranjithnalimela (6) and venkatasubbaiah (2)
# Via ranjithnalimela
* 'master' of github.com:ranjithnalimela/sideline:
  removed fancybox for remixed gifs
  fixed loading indicator on add caption
  commented redirect on add caption and added js file
  decresing text font size for add caption when length increase and
fixed production deployment issues
  changed remixed images view in index page
  changed remixed show page css
  new template for GIF images
  changes in images index page(Improved the performance)

Conflicts:
	app/views/images/index.html.erb