build using rails_apps_composer 2.2.20
merge upstream
updated to rails 3.2.10