removing scriptcam-rails gem
manual installation of scriptcam
fixing merge conflicts