Merge branch 'release/20140120-1210'
Merge tag '20140120-1210' into develop

content
Merge branch 'develop' of github.com:afitterling/rails4base into develop
removed debug
content
links
text
Merge branch 'feature/content' of github.com:afitterling/rails4base into feature/content