Added french locales
Remove DJANGO_VERSION from the recommended settings

- It adds a headache (it needs to be maintained)
- It can already be obtained by djang.get_version()
- forum_modules/updates/base.py already uses the above method to report the correct version
Update readers.py

Suggest adding: 
from django.utils.http import urlquote
Making requirements to Django 1.6
Merge commit '9bea91a' into merge_small_prs
Remove unused (and incorrectly spelled) import
Allow for missing content types
Pagination updates

- Optimize "hottest" DB query
- Add "unanswered question" sort order
- Add "active" sort order for comments/answers
Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder

Fixes http://jira.osqa.net/browse/OSQA-819
Simplify registry logic
Further fixes for subfolder hosting
Further fixes for subfolder hosting
Correct text
Serve up robots.txt as plain text.
Merge pull request #65 from geraldcombs/patch-1

Serve up robots.txt as plain text.
Merge pull request #44 from udacity/merge_small_prs

Merge small prs
Merge pull request #26 from udacity/remove_dj_version

Remove DJANGO_VERSION from the recommended settings
Merge pull request #40 from jasimmk/master

Making requirements to Django 1.6
Merge pull request #45 from udacity/sort_modes

Pagination updates
Merge pull request #46 from udacity/subfolder_fixes

Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder