Moving and renamaing manual fixes file to be more intuitive.
Define API key in base settings, loaded from a file
Merge branch 'master' into settings