Fixing the issues that arised from the failed merging of the dev
branch with the master branch. Everything should be fine now.
Merge branch 'master' into 'dev'.