Ignored .idea IDE local development files
Changed to use postgres 'mayan' database and user.
Refactored settings to support multiple sites and secrets
Merge remote-tracking branch 'upstream/master'
Reconfigured settings to support mayan/apps and separate production and development.
Tidied common settings
Reverted to default (sqlite) settings so all working.
Moved original settings to be common includes.
Tidied BASE_DIR/SITE_ROOT
Added settings/includes/secrets.py facility for site specific secret data that should not be in the repo.
Added settings/development.py
Simplified configuration and corrected debug_toolbar induced problem
Added required postgres database configuration
Added explicit debug toolbar setup
Added .gitignore so that secrets.py never gets added into the repo by accident.
Added deployment information for production site
removed redundant import
Added gunicorn to production requirements
Add document uploading and deletion functional test
Merge pull request #13 from mbehrle/feature/lost_merges

Feature/lost merges