Unification merge conflict
Created by: tgrego
Do not merge!
This branch is a merge of master and feature/unified-design branches, that have diverged... Apparently both branches are used in different places, so the merge has to be correct for master to become the only branch used.
Some minor fixes added.