upgrade rails from 3.2.20 to 3.2.21 to fix actionpack vulnerability CVE-2014-7829
Merge branch 'develop' into obj_rights_ARGO-226_ARGO-227