conflicts solved

apps/calendar/ajax/getcal.php

apps/calendar/css/style.css

apps/calendar/templates/settings.php

apps/gallery/ajax/cover.php

apps/gallery/ajax/createAlbum.php

apps/gallery/ajax/getAlbums.php

apps/gallery/ajax/getCovers.php

apps/gallery/ajax/scanForAlbums.php

apps/gallery/ajax/thumbnail.php

apps/gallery/index.php

core/img/actions/selected.png

core/img/actions/selected.svg