Merge branch 'devel' into prod
Merge branch 'prod' of https://github.com/darthsuicune/CreuRoja into prod
changed api key