Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor

apps/calendar/index.php

apps/contacts/ajax/addcard.php

apps/contacts/appinfo/info.xml

apps/contacts/css/formtastic.css

apps/contacts/css/styles.css

apps/contacts/index.php

apps/contacts/js/interface.js

apps/contacts/lib/vcard.php

apps/contacts/templates/index.php

apps/contacts/templates/part.addcardform.php

apps/contacts/templates/part.addpropertyform.php

apps/contacts/templates/part.details.php

apps/contacts/templates/part.property.php

apps/contacts/templates/part.setpropertyform.php

apps/contacts/templates/settings.php

apps/external/ajax/seturls.php

apps/external/appinfo/app.php

apps/external/appinfo/info.xml

apps/external/img/external.png

apps/external/img/external.svg