Removing the portfolio as a dependency
Fixes refactoring bug
Merge pull request #945 from kitan1982/bugfix

Fixes refactoring bug
Merge pull request #944 from ngodfraind/master

Update scripts
Fixing some calendar bugs.