Merge branch 'hotfix/v2.2.5'
update gems to use rails 3.2.19 which fixes an sql injection bug
Merge branch 'hotfix/v2.2.6' into develop