Merge branch 'hotfix/0.3.0.2'
update rails to 3.2.17
Merge branch 'hotfix/0.3.0.3'
Merge branch 'master' into nerdpol_ch