Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 vuotta sitten
..
icon 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 vuotta sitten
splash 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 vuotta sitten