update assets-rails
update readme
merge master