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

diff --combined settings_local.py.dist
index 81c1eaaf7093bc065e4bde3b61eb4eaf09736e13,ad178f6efe05157c70f028ba8899c61efdcac588..e687228a3084c98c9c8ced11f603ad2e9589be6b
--- 1/settings_local.py.dist
--- 2/settings_local.py.dist
+++ b/settings_local.py.dist
@@@ -58,6 -58,11 +58,11 @@@ DATABASES = 
  CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
  #CACHE_BACKEND = 'dummy://'
  SESSION_ENGINE = 'django.contrib.sessions.backends.db'
+ # Customize the values below if OSQA is in a subfolder and especially you're planning on
+ # running multiple Django applications (OSQA or others) on the same domain in different
+ # subfolders
+ #SESSION_COOKIE_PATH = '/'
+ #CSRF_COOKIE_PATH = '/'
  
  # This should be equal to your domain name, plus the web application context.
  # This shouldn't be followed by a trailing slash.
@@@ -72,6 -77,7 +77,6 @@@ TIME_ZONE = 'America/New_York
  USE_I18N = True
  LANGUAGE_CODE = 'en'
  
 -DJANGO_VERSION = 1.1
  OSQA_DEFAULT_SKIN = 'default'
  
  DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']