--- a/app/src/main/aidl/com/beem/project/beem/service/aidl/IBeemConnectionListener.aidl	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/aidl/com/beem/project/beem/service/aidl/IBeemConnectionListener.aidl	Thu Dec 21 16:56:22 2017 -0800
@@ -45,7 +45,6 @@
 
 /**
  * Interface to listen for connection events
- * @author Da Risk <barthe_f@epitech.eu>
  */
 interface IBeemConnectionListener {
 

--- a/app/src/main/java/com/beem/project/beem/BeemApplication.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/BeemApplication.java	Thu Dec 21 16:56:22 2017 -0800
@@ -54,7 +54,6 @@
 /**
  * This class contains informations that needs to be global in the application.
  * Theses informations must be necessary for the activities and the service.
- * @author Da Risk <darisk972@gmail.com>
  */
 public class BeemApplication extends Application {
 

--- a/app/src/main/java/com/beem/project/beem/service/LoginAsyncTask.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/service/LoginAsyncTask.java	Thu Dec 21 16:56:22 2017 -0800
@@ -52,7 +52,6 @@
 /**
  * This is an asynchronous task that will launch a connection to the XMPP server.
  * @see android.os.AsyncTask
- * @author Da Risk <da_risk@elyzion.net>
  */
 public class LoginAsyncTask extends AsyncTask<IXmppFacade, Integer, Boolean> {
 

--- a/app/src/main/java/com/beem/project/beem/service/PrivacyListItem.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/service/PrivacyListItem.java	Thu Dec 21 16:56:22 2017 -0800
@@ -48,7 +48,7 @@
 
 /**
  * A simplified version of the Smack PrivacyItem class.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
+ * @author Jean-Manuel Da Silva &lt;dasilvj at beem-project dot com&gt;
  */
 public class PrivacyListItem implements Parcelable {
 

--- a/app/src/main/java/com/beem/project/beem/ui/Chat.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/ui/Chat.java	Thu Dec 21 16:56:22 2017 -0800
@@ -116,7 +116,7 @@
 
 /**
  * This class represents an activity which allows the user to chat with his/her contacts.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
+ * @author Jean-Manuel Da Silva &lt;dasilvj at beem-project dot com&gt;
  */
 public class Chat extends Activity implements TextView.OnEditorActionListener {
 

--- a/app/src/main/java/com/beem/project/beem/ui/Login.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/ui/Login.java	Thu Dec 21 16:56:22 2017 -0800
@@ -65,7 +65,6 @@
 
 /**
  * This class is the main Activity for the Beem project.
- * @author Da Risk <darisk@beem-project.com>
  */
 public class Login extends Activity {
 

--- a/app/src/main/java/com/beem/project/beem/ui/LoginAnim.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/ui/LoginAnim.java	Thu Dec 21 16:56:22 2017 -0800
@@ -72,7 +72,6 @@
 
 /**
  * This class is an activity which display an animation during the connection with the server.
- * @author Da Risk <darisk972@gmail.com>
  */
 public class LoginAnim extends Activity {
 

--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java	Thu Dec 21 16:56:22 2017 -0800
@@ -56,7 +56,7 @@
 
 /**
  * Use this builder to build a dialog which allows you to delete a contact from a specific roster.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
+ * @author Jean-Manuel Da Silva &lt;dasilvj at beem-project dot com&gt;
  */
 public class DeleteContact extends AlertDialog.Builder {
 

--- a/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java	Thu Dec 21 16:56:22 2017 -0800
@@ -61,7 +61,7 @@
 
 /**
  * Use this builder to build a dialog which allows you resend a subscription query to a contact.
- * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
+ * @author Jean-Manuel Da Silva &lt;dasilvj at beem-project dot com&gt;
  */
 public class ResendSubscription extends AlertDialog.Builder {
 

--- a/app/src/main/java/com/beem/project/beem/utils/SortedList.java	Thu Dec 21 15:56:42 2017 -0800
+++ b/app/src/main/java/com/beem/project/beem/utils/SortedList.java	Thu Dec 21 16:56:22 2017 -0800
@@ -41,7 +41,6 @@
  * All methods which allow you to insert an object at a specific index
  * will throw an UnsupportedOperationException.
  *
- * @author Da Risk <da_risk@beem-project.com>
  * @param <E> the type of elements maintained by this list
  */
 public class SortedList<E> implements List<E> {