Merge branch 'release/20140120-1215'
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'feature/content' of github.com:afitterling/rails4base
Merge branch 'feature/content' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'master' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'master' of github.com:afitterling/rails4base
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'develop' of github.com:afitterling/rails4base
Merge branch 'refs/heads/develop'