Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

admin/Gemfile

@@ -37,7 +37,6 @@ gem 'bootstrap-will_paginate', '0.0.6'
 gem 'carrierwave', '0.9.0'
 gem 'carrierwave_direct'
 gem 'uuidtools', '2.1.2'
-gem 'bcrypt-ruby', '3.0.1'
 gem 'jquery-rails' # , '2.3.0' # pinned because jquery-ui-rails was split from jquery-rails, but activeadmin doesn't support this gem yet
 gem 'jquery-ui-rails'
 gem 'rails3-jquery-autocomplete'

ruby/lib/jam_ruby/models/feed.rb

@@ -20,7 +20,7 @@ module JamRuby
       sort ||= 'date'
       raise "not valid sort #{sort}" unless SORT_TYPES.include?(sort)
 
-      start = params[:start]
+      start = params[:start].presence
       if sort == 'date'
         start ||= FIXNUM_MAX
       else