Fixed merge conflict in /files/ajax/move.php

.htaccess

apps/contacts/ajax/addcard.php

apps/contacts/ajax/contacts.php

apps/contacts/css/styles.css

apps/contacts/index.php

apps/contacts/js/LICENSE.jquery.inview

apps/contacts/js/interface.js

apps/contacts/js/jquery.inview.txt

apps/contacts/lib/addressbook.php

apps/contacts/lib/vcard.php

apps/files_sharing/sharedstorage.php

apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as

apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla

...js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js

...y.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js

...ry.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as

...uery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as

...uery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as

...y.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as

apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js