Merge pull request #2 from kmarcos/master

Initial version of whiteboard portlet
Merge remote-tracking branch 'upstream/master'