resolved merge conflict

.tx/config

AUTHORS

admin/ajax/changepassword.php

admin/appinfo/app.php

admin/css/apps.css

admin/css/users.css

admin/l10n/da.php

admin/l10n/de.php

admin/l10n/es.php

admin/l10n/fr.php

admin/l10n/nl.php

admin/l10n/pl.php

admin/templates/system.php

apps/contacts/appinfo/app.php

apps/contacts/templates/part.details.php

apps/contacts/templates/part.property.php

apps/media/css/music.css

apps/media/css/player.css

apps/media/js/collection.js

apps/media/js/player.js