Update/sync of develop before branching

src/main/java/no/nibio/vips/logic/controller/session/UserBean.java

@@ -215,6 +215,13 @@ public class UserBean {
         user = em.find(VipsLogicUser.class, user.getUserId());
         // Remove all notification subscriptions
         SessionControllerGetter.getMessagingBean().deleteAllNotificationSubscriptions(user);
+        // TODO: Move these objects from user to be deleted to the organization's archive user
+        // * All observations
+        // * All messages
+        // * All POIs
+        // * All non-private forecast configurations
+        //
+        // TODO: Delete all of the user's private forecast configurations and results
         em.remove(user);
     }
     

src/main/java/no/nibio/vips/logic/entity/Organization.java

@@ -39,7 +39,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.FetchType;
-import org.hibernate.annotations.Type;
 
 /**
  * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>