Updated variables and settings.
Merge branch 'master' of https://github.com/Fingerpaint/project-docs