Merge tag '20140119-1610' into develop

it is a fix only
Merge tag 'failsafe' into develop

failsafe fix
Merge branch 'master' of github.com:afitterling/rails4base into develop
fixes
content
404
Merge branch 'release/20140119-1710'