added URL for documentation
reorganize settings.py file
Merge branch 'master' into dev