changed API key and secret to the official openHAB defaults
fixed merge conflicts