add {% csrf_token %} to search form in /solr/templates/results.html
Fix bug with width/height restrictions in permissions
Make page title configurable
Don't load facet values for 'last modified' and 'created' facets
Add safe filter to copyright setting to allow use of HTML
Hide last modified and record created facets by default
Move EXPOSE_TO_CONTEXT to main settings.py, so new settings can be handled
Add new SHOW_FRONTPAGE_LOGIN setting
Fix missing setting in settings_local_template.py
Fix copyright statement if not set explicitly

Conflicts:
	rooibos/templates/master.html
Rename master template to master_root, add MASTER_TEMPLATE setting
Add new master.html that dynamically extends MASTER_TEMPLATE
Add MASTER_TEMPLATE setting to settings_local_template
Update changes
Change default for user fields from null to blank string
Properly inherit from block content-top
add pycharm config dir and optional data dir to .gitignore
add requirements.txt

note, currently specifies Django 1.3.7, may need other review
Change import for Pillow Image module
Fix broken PIL import