revert a change that causes builds to fail.

I thought i forget to change the value before, but it turns out to be left
for a test.

I forgot to run test before push.
updated rails as version <3.0.18 suffer from sql-injection vulnerability
Merge branch 'master' into api_key
Merge branch 'master' into api_key