security
content
Merge tag '20140120-1210' into develop

content
Merge branch 'release/20140120-1215'
Merge branch 'develop' of github.com:afitterling/rails4base into develop
Merge branch 'develop' of github.com:afitterling/rails4base