Merge branch 'master' into movable_apps

diff --cc apps/contacts/ajax/loadphoto.php
Simple merge

diff --cc apps/contacts/ajax/savecrop.php
Simple merge

diff --cc apps/contacts/ajax/uploadphoto.php
Simple merge

diff --cc apps/contacts/import.php
index 8cf0a173db1570a12e4c3ea963b4707671340c76,233ed5be22f69814beca882d1191cab9aa4a22e6..b80021e00ea47befbecce87909e6832d0e5afe7e
--- 1/apps/contacts/import.php
--- 2/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@@ -7,9 -7,9 +7,9 @@@
   */
  //check for addressbooks rights or create new one
  ob_start();
 -require_once ('../../lib/base.php');
 + 
  OC_JSON::checkLoggedIn();
- OC_Util::checkAppEnabled('calendar');
+ OC_Util::checkAppEnabled('contacts');
  $nl = "\n";
  $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
  if(is_writable('import_tmp/')){

diff --cc apps/contacts/photo.php
Simple merge

diff --cc apps/contacts/thumbnail.php
Simple merge