finished settings and cfg master from admin user
Portfolio creation + Linking Portfolio to currentEstate
Merge remote-tracking branch 'upstream/master'