Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop
Updated Gemfile.lock
Updated rails to 4.0.4
fixed broken step in cuke
removed show me the page
Merge branch 'fixes' of https://github.com/yggie/WebsiteOne into dependencies
Removed restrictions on coffeescript
Upgraded jbuilder
Updated bootstrap rails
Update capybara-webkit to latest
Removed unrequired restrictions on most gems
Changed scenario name
Moved font and font-awesome imports to application.html.erb from css files
Merge pull request #334 from sampritipanda/dependencies

Dependencies Update
Merge branch 'develop' of https://github.com/sampritipanda/WebsiteOne into refactoring