Merge branch 'master' of https://github.com/marcuzandersson/Design.git
Changes made by Conny Burman (Curre_@outlook.com).
Changes made by Conny Burman (Curre_@outlook.com).
Merge branch 'master' of https://github.com/swensk/Design.git