Change "vcardcountry" to "c" for HOME ADR

Instead of "vcardcountry", "c" is used for "RFC2256: ISO-3166 country 2-letter code" in objectClass "inetOrgPerson".
return 'PHOTO' attribute on AddressbookProvider::search
Use OCP\ITags in lib/controller/importcontroller.php.
fix excessive overwrite of mobile sizes defined in core, fix #555
correct selection of current type for multi-type parameters: #536

This check was exactly the wrong way around, so the code to select
the appropriate type wouldn't run when it was actually needed.
Change label when there is no contact
[tx-robot] updated from transifex
[tx-robot] updated from transifex
adding php-lint
fix php 4.3
Extracting closures into methods to solve php 5.3 issue #546
Merge pull request #550 from ockham/importcontroller-use-itags

Use OCP\ITags in lib/controller/importcontroller.php.
Merge pull request #568 from owncloud/adding-php-lint

adding php-lint
Merge pull request #560 from AdamWill/536

correct selection of current type for multi-type parameters: #536
Merge pull request #545 from owncloud/return-photo-on-search-master

return 'PHOTO' attribute on AddressbookProvider::search
Merge pull request #561 from owncloud/import-label

Change label when there is no contact
Merge pull request #556 from owncloud/fix-mediaqueries

fix excessive overwrite of mobile sizes defined in core, fix #555
properly convert the json serialized data to the format as expected by the public contacts search
Merge pull request #569 from owncloud/fix-search-master

properly convert the json serialized data to the format as expected by t...
[tx-robot] updated from transifex