Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails

Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php

diff --cc apps/contacts/css/styles.css
index 8678ca99244ff9591ec0da313a7c1260343d61db,f961767a0d62a90bcd0ce03616f2a55ad8958fdf..b6709c5a7912cef45e73cb90c689cd2f4ac12e1f
--- 1/apps/contacts/css/styles.css
--- 2/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@@ -1,4 -1,4 +1,5 @@@
 +#contacts li { padding-left:25px;background:url('../img/person.svg') no-repeat; }
+ #chooseaddressbook {margin-right: 170px; float: right;}
  #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
  #contacts_details_photo { margin:.5em 0em .5em 25%; }
  

diff --cc apps/contacts/js/interface.js
Simple merge

diff --cc apps/contacts/templates/index.php
index bada45ee0ece03603018b12e31a2517f4d0388b0,8592ffe1c4c651a056470f8c92adedb217c857c0..9e63b201987aba7ba40b3b2c7386e1b09ecef4f1
--- 1/apps/contacts/templates/index.php
--- 2/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@@ -1,10 -1,6 +1,13 @@@
 +<?php // Include Style and Script
 +OC_Util::addScript('contacts','interface');
 +OC_Util::addScript('contacts','jquery.inview');
 +OC_Util::addStyle('contacts','styles');
 +OC_Util::addStyle('contacts','formtastic');
 +?>
 +
+ <script type='text/javascript'>
+       var totalurl = '<?php echo OC_Helper::linkTo('contacts', 'carddav.php', null, true); ?>/addressbooks';
+ </script>
  <div id="controls">
        <form>
                <input type="button" id="contacts_newcontact" value="<?php echo $l->t('Add Contact'); ?>">