diff --git a/app/build.gradle b/app/build.gradle
index 899893a6..1750a66e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile 'commons-io:commons-io:2.4'
     // Lombok for useful @helpers
-    provided 'org.projectlombok:lombok:1.14.8'
+    provided 'org.projectlombok:lombok:1.16.4'
     // ical4j for parsing/generating iCalendars
     compile 'org.mnode.ical4j:ical4j:1.0.6'
     // ez-vcard for parsing/generating VCards
@@ -58,7 +58,7 @@ dependencies {
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     }
     // dnsjava for querying SRV/TXT records
-    compile 'dnsjava:dnsjava:2.1.6'
+    compile 'dnsjava:dnsjava:2.1.7'
     // HttpClient 4.3, Android flavour for WebDAV operations
     //compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
     compile project(':lib:httpclient-android')
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java b/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java
index 6fef1eb2..3b927aea 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
 package at.bitfire.davdroid;
-import java.util.Arrays;
 
 import junit.framework.TestCase;
-import at.bitfire.davdroid.ArrayUtils;
+
+import java.util.Arrays;
 
 
 public class ArrayUtilsTest extends TestCase {
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java b/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java
index bb2f4fdb..4ef7a5a1 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -8,11 +8,11 @@
 
 package at.bitfire.davdroid;
 
+import android.util.Log;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import android.util.Log;
-
 public class TestConstants {
 	public static final String ROBOHYDRA_BASE = "http://192.168.0.11:3000/";
 	
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java b/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java
index 2ee94a21..1fe00b37 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -7,10 +7,9 @@
  */
 package at.bitfire.davdroid;
 
-import java.net.URI;
-
 import junit.framework.TestCase;
-import at.bitfire.davdroid.URIUtils;
+
+import java.net.URI;
 
 
 public class URLUtilsTest extends TestCase {
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java
index 6bfdb96b..041a7209 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
index eb41b8b7..68d184fa 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
index e44afb6c..65d1be86 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,6 @@ import android.Manifest;
 import android.accounts.Account;
 import android.annotation.TargetApi;
 import android.content.ContentProviderClient;
-import android.content.ContentProviderOperation;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
@@ -20,10 +19,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.RemoteException;
 import android.provider.CalendarContract;
-import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Calendars;
 import android.provider.CalendarContract.Events;
-import android.provider.CalendarContract.Reminders;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 
@@ -43,10 +40,7 @@ import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.SimpleTimeZone;
 
-import at.bitfire.davdroid.Constants;
-import at.bitfire.davdroid.webdav.DavProp;
 import lombok.Cleanup;
 
 public class LocalCalendarTest extends InstrumentationTestCase {
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java b/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java
index 30492125..4abde89c 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -8,15 +8,16 @@
 
 package at.bitfire.davdroid.syncadapter;
 
+import android.test.InstrumentationTestCase;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
 
-import android.test.InstrumentationTestCase;
+import at.bitfire.davdroid.TestConstants;
 import at.bitfire.davdroid.resource.DavResourceFinder;
 import at.bitfire.davdroid.resource.ServerInfo;
 import at.bitfire.davdroid.resource.ServerInfo.ResourceInfo;
-import at.bitfire.davdroid.TestConstants;
 import ezvcard.VCardVersion;
 
 public class DavResourceFinderTest extends InstrumentationTestCase {
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java b/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java
index 3112a9fb..aa8000c7 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -8,10 +8,8 @@
 
 package at.bitfire.davdroid.webdav;
 
-import java.io.IOException;
-
 import junit.framework.TestCase;
-import at.bitfire.davdroid.TestConstants;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpOptions;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -20,6 +18,10 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.protocol.HttpContext;
 
+import java.io.IOException;
+
+import at.bitfire.davdroid.TestConstants;
+
 public class DavRedirectStrategyTest extends TestCase {
 	
 	CloseableHttpClient httpClient;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java b/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java
index 6c50ce0d..d308fc11 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -8,24 +8,22 @@
 
 package at.bitfire.davdroid.webdav;
 
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.security.cert.CertPathValidatorException;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLSocket;
-
 import android.util.Log;
+
 import junit.framework.TestCase;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.http.HttpHost;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.security.cert.CertPathValidatorException;
+
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+
 import lombok.Cleanup;
 
 public class TlsSniSocketFactoryTest extends TestCase {
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java b/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
index 051ac39f..1ab93ee9 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -7,24 +7,23 @@
  */
 package at.bitfire.davdroid.webdav;
 
+import android.content.res.AssetManager;
+import android.test.InstrumentationTestCase;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.impl.client.CloseableHttpClient;
+
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Arrays;
-import java.util.List;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 
-import ezvcard.VCardVersion;
-import lombok.Cleanup;
-
-import org.apache.commons.io.IOUtils;
-
-import android.content.res.AssetManager;
-import android.test.InstrumentationTestCase;
 import at.bitfire.davdroid.TestConstants;
 import at.bitfire.davdroid.webdav.HttpPropfind.Mode;
 import at.bitfire.davdroid.webdav.WebDavResource.PutMode;
-import org.apache.http.impl.client.CloseableHttpClient;
+import ezvcard.VCardVersion;
+import lombok.Cleanup;
 
 // tests require running robohydra!
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f92d8389..21e14846 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="at.bitfire.davdroid"
-    android:versionCode="66" android:versionName="0.8.0-beta3"
+    android:versionCode="66" android:versionName="0.8.0"
     android:installLocation="internalOnly">
 
     <uses-sdk
diff --git a/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java b/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java
index 30a4d572..c9ac7247 100644
--- a/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java
+++ b/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/Constants.java b/app/src/main/java/at/bitfire/davdroid/Constants.java
index bb8ce076..47e6ecec 100644
--- a/app/src/main/java/at/bitfire/davdroid/Constants.java
+++ b/app/src/main/java/at/bitfire/davdroid/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@ import net.fortuna.ical4j.model.property.ProdId;
 
 public class Constants {
 	public static final String
-		APP_VERSION = "0.8.0-beta3",
+		APP_VERSION = "0.8.0",
 		ACCOUNT_TYPE = "bitfire.at.davdroid",
 		WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
 		WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";
diff --git a/app/src/main/java/at/bitfire/davdroid/DAVUtils.java b/app/src/main/java/at/bitfire/davdroid/DAVUtils.java
index eeeeaab9..ebf84a82 100644
--- a/app/src/main/java/at/bitfire/davdroid/DAVUtils.java
+++ b/app/src/main/java/at/bitfire/davdroid/DAVUtils.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid;
 
 import java.util.regex.Matcher;
diff --git a/app/src/main/java/at/bitfire/davdroid/DateUtils.java b/app/src/main/java/at/bitfire/davdroid/DateUtils.java
index 8f060c60..0838527b 100644
--- a/app/src/main/java/at/bitfire/davdroid/DateUtils.java
+++ b/app/src/main/java/at/bitfire/davdroid/DateUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/URIUtils.java b/app/src/main/java/at/bitfire/davdroid/URIUtils.java
index d6f76fb9..42b7e152 100644
--- a/app/src/main/java/at/bitfire/davdroid/URIUtils.java
+++ b/app/src/main/java/at/bitfire/davdroid/URIUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java b/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java
index be05bacb..d1ef90c9 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/CalDavTaskList.java b/app/src/main/java/at/bitfire/davdroid/resource/CalDavTaskList.java
index abc6d271..9bc02e22 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/CalDavTaskList.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/CalDavTaskList.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid.resource;
 
 import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java b/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java
index d13af0ac..76452955 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Contact.java b/app/src/main/java/at/bitfire/davdroid/resource/Contact.java
index a64c2c53..ac476030 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Contact.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Contact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java b/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
index 73be34c4..2b7bde9c 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Event.java b/app/src/main/java/at/bitfire/davdroid/resource/Event.java
index 6b86c46a..71e1542c 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Event.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java b/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java
index 8e97cc71..99a39cac 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
index c389af11..e79931fe 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
index 75b1a039..4f340fdb 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
index e396b88d..fc62c98b 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java
index 4ef9c00e..f3516367 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
index 11f98433..4d975674 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalTaskList.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid.resource;
 
 import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Note.java b/app/src/main/java/at/bitfire/davdroid/resource/Note.java
deleted file mode 100644
index 2843bfd0..00000000
--- a/app/src/main/java/at/bitfire/davdroid/resource/Note.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package at.bitfire.davdroid.resource;
-
-import android.util.Log;
-
-import net.fortuna.ical4j.data.CalendarBuilder;
-import net.fortuna.ical4j.data.CalendarOutputter;
-import net.fortuna.ical4j.data.ParserException;
-import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.ComponentList;
-import net.fortuna.ical4j.model.PropertyList;
-import net.fortuna.ical4j.model.ValidationException;
-import net.fortuna.ical4j.model.component.VJournal;
-import net.fortuna.ical4j.model.component.VToDo;
-import net.fortuna.ical4j.model.property.Created;
-import net.fortuna.ical4j.model.property.Description;
-import net.fortuna.ical4j.model.property.DtStamp;
-import net.fortuna.ical4j.model.property.Location;
-import net.fortuna.ical4j.model.property.ProdId;
-import net.fortuna.ical4j.model.property.Summary;
-import net.fortuna.ical4j.model.property.Uid;
-import net.fortuna.ical4j.model.property.Version;
-import net.fortuna.ical4j.util.SimpleHostInfo;
-import net.fortuna.ical4j.util.UidGenerator;
-
-import org.apache.commons.lang.StringUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import at.bitfire.davdroid.Constants;
-import at.bitfire.davdroid.syncadapter.DavSyncAdapter;
-import lombok.Getter;
-import lombok.Setter;
-
-public class Note extends Resource {
-	private final static String TAG = "davdroid.Note";
-
-	@Getter @Setter	Created created;
-	@Getter @Setter	String summary, description;
-
-
-	public Note(String name, String ETag) {
-		super(name, ETag);
-	}
-
-	public Note(long localId, String name, String ETag)
-	{
-		super(localId, name, ETag);
-	}
-
-	@Override
-	public void initialize() {
-		UidGenerator generator = new UidGenerator(new SimpleHostInfo(DavSyncAdapter.getAndroidID()), String.valueOf(android.os.Process.myPid()));
-		uid = generator.generateUid().getValue();
-		name = uid + ".ics";
-	}
-
-
-	@Override
-	public void parseEntity(InputStream entity, AssetDownloader downloader) throws IOException, InvalidResourceException {
-		net.fortuna.ical4j.model.Calendar ical;
-		try {
-			CalendarBuilder builder = new CalendarBuilder();
-			ical = builder.build(entity);
-
-			if (ical == null)
-				throw new InvalidResourceException("No iCalendar found");
-		} catch (ParserException e) {
-			throw new InvalidResourceException(e);
-		}
-
-		ComponentList notes = ical.getComponents(Component.VJOURNAL);
-		if (notes == null || notes.isEmpty())
-			throw new InvalidResourceException("No VJOURNAL found");
-		VJournal note = (VJournal)notes.get(0);
-
-		if (note.getUid() != null)
-			uid = note.getUid().getValue();
-
-		if (note.getCreated() != null)
-			created = note.getCreated();
-
-		if (note.getSummary() != null)
-			summary = note.getSummary().getValue();
-		if (note.getDescription() != null)
-			description = note.getDescription().getValue();
-	}
-
-
-	@Override
-	public String getMimeType() {
-		return "text/calendar";
-	}
-
-	@Override
-	public ByteArrayOutputStream toEntity() throws IOException {
-		final net.fortuna.ical4j.model.Calendar ical = new net.fortuna.ical4j.model.Calendar();
-		ical.getProperties().add(Version.VERSION_2_0);
-		ical.getProperties().add(Constants.ICAL_PRODID);
-
-		final VJournal note = new VJournal();
-		ical.getComponents().add(note);
-		final PropertyList props = note.getProperties();
-
-		if (uid != null)
-			props.add(new Uid(uid));
-
-		if (summary != null)
-			props.add(new Summary(summary));
-		if (description != null)
-			props.add(new Description(description));
-
-		CalendarOutputter output = new CalendarOutputter(false);
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		try {
-			output.output(ical, os);
-		} catch (ValidationException e) {
-			Log.e(TAG, "Generated invalid iCalendar");
-		}
-		return os;
-	}
-
-}
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java b/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java
index 50cda9ca..2205b64c 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java b/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java
index 04e275e3..b0a33608 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Resource.java b/app/src/main/java/at/bitfire/davdroid/resource/Resource.java
index 3177a646..acd75c3d 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Resource.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Resource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java b/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
index fdf81565..072c8cb6 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Task.java b/app/src/main/java/at/bitfire/davdroid/resource/Task.java
index e9b853f9..2b8ccaa5 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Task.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Task.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid.resource;
 
 import android.util.Log;
@@ -7,7 +15,6 @@ import net.fortuna.ical4j.data.CalendarOutputter;
 import net.fortuna.ical4j.data.ParserException;
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.ComponentList;
-import net.fortuna.ical4j.model.Date;
 import net.fortuna.ical4j.model.DateTime;
 import net.fortuna.ical4j.model.PropertyList;
 import net.fortuna.ical4j.model.ValidationException;
@@ -36,7 +43,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 
 import at.bitfire.davdroid.Constants;
 import at.bitfire.davdroid.syncadapter.DavSyncAdapter;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java
index 3ffdcf2a..fe1efef8 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java
index af85545f..fad42706 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
index 72f86b11..f08a614d 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java
index aa00eb37..573f592a 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
index b4d09b84..e5fc87a5 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
index 165a5a4f..25088e4c 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java
index 489b90d9..98fa83ec 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/MainActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/MainActivity.java
index ae08b4d4..4d1f648c 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/MainActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/MainActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java
index 3273d73e..6a9821ac 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java
index 1769c523..d94a80eb 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java
index 1c333854..65d55dec 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java
index f43c556f..67c4fde8 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java
index 7cc901b1..852aaa29 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
index eb32e74b..dd27338f 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AddAccountActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/InstallAppsFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/InstallAppsFragment.java
index a5beaa41..35e5d889 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/InstallAppsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/InstallAppsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginEmailFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginEmailFragment.java
index 37f73690..ce9454d8 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginEmailFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginEmailFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginTypeFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginTypeFragment.java
index 0844241f..9133afb5 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginTypeFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginTypeFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginURLFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginURLFragment.java
index ae1db7c8..a4719b83 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginURLFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginURLFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/QueryServerDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/QueryServerDialogFragment.java
index 96480d38..79820511 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/QueryServerDialogFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/QueryServerDialogFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java
index 0bb90a2a..a51646ab 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java
index d85fd127..447c2908 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/SelectCollectionsFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/WebDavResourceAdapter.java b/app/src/main/java/at/bitfire/davdroid/ui/setup/WebDavResourceAdapter.java
index 73231e09..83974400 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/WebDavResourceAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/WebDavResourceAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java
index 06785082..fdb1b44b 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java
index 9d9640dd..9ea95b51 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarQuery.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarQuery.java
index ded60ad7..2c0ff88e 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarQuery.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarQuery.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid.webdav;
 
 import org.simpleframework.xml.Element;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavCompFilter.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavCompFilter.java
index ecd64e18..f3eef66a 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavCompFilter.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavCompFilter.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid.webdav;
 
 import org.simpleframework.xml.Attribute;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java
index fcd5d51f..4ad0efb7 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavFilter.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavFilter.java
index dc5b9dfc..a9dd7f38 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavFilter.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavFilter.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ */
+
 package at.bitfire.davdroid.webdav;
 
 import org.simpleframework.xml.Element;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java
index 05dbf662..bebe47eb 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java
index 6c917b7e..eb289bc6 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java
index 9aa6c610..b8e5198e 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java
index b82850c6..c3bcf995 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java
index f9b89994..c20bd071 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java
index 091b41c6..0934992c 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java
index b73b3a05..bd00414f 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java
index 36f08a7e..81db350b 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java
index d4335a40..e4f44b8b 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java
index aa68f392..7942aac8 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java
index 7aa88afc..52fd4638 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java
index 6dc75596..93430338 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java
index 6db0fd18..5cdceb59 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java b/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java
index 9469c2a2..748ec0a0 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java b/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java
index 239acd98..b8085ed3 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java b/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java
index 20aefc4a..2d9b6f12 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java b/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java
index 7a09cc52..e734bb1d 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java b/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java
index 6b845de2..86add89e 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java b/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java
index 49a2889e..d9ee5540 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java b/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
index 049b96fc..c1a42c39 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java b/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java
index bbe6d5ec..213d2259 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Public License v3.0
  * which accompanies this distribution, and is available at
diff --git a/app/src/main/lombok.config b/app/src/main/lombok.config
new file mode 100644
index 00000000..264dc658
--- /dev/null
+++ b/app/src/main/lombok.config
@@ -0,0 +1 @@
+lombok.addGeneratedAnnotation = false