update Gemfile
upgrade rails
update scope method
update gemset again
add ruby gemset and ruby version>
add strong parameters
change routes
update kaminari
rewrite the english translation
add turbolinks
correct gemfile
use strong parameters in contact model
add tag_list to the params, but query ist still not working
add tag_list to the params, but query ist still not working
solve merge conflict
reconfigure the overwriting of rails rake:update
merge  bootstrap branch
update Gemfile.lock
comment out bootstrap import
correct the path for admin comment