Initial version of whiteboard portlet
solving conflicts
solving conflicts 2