Merge pull request #1 from adt123/develop

Develop
Remove hard-coded API keys
Merge pull request #1 from kristallizer/develop

Develop