rails 3.2.12 > 3.2.16
Merge branch 'master' of github.com:bisscraper/bisscraper