Merge Portfoliodev into Master Branch

Signed-off-by: Thomas Moore <tsanm93@gmail.com>