added development keys for testing purposes
fixed merge conflicts