Upgraded Rails to 3.2.11
Merge branch 'rails_upgrade' into develop
Merge branch 'develop' of github.com:amooma/GS5 into develop