fixing the packaging
updating to the latest portal code
Merge pull request #279 from zinic/master

Update to latest portal code