Pull from upstream
Merge remote-tracking branch 'upstream/master'
Fixed links
replaced truncatewords with truncatewords_html
Moved decorators to views
Renamed templates to avoid confusion, adjusted for manual pagination
Renamed utility app
Renamed login and logout links
Removed view logic from urls file
Moved view logic to views
Refactored views from class-based to function-based
Added favicon
Clean up
Cleaned up
Shortened __unicode__ representation
Removed old comments
Fixed media root path
Fixed favicon path
Serving media files in development
Fetch