added viewing views spec
resolving Gemfile merge
removing development.log from stage