Merge remote-tracking branch 'origin/updates_portfolio' into updates_portfolio

Conflicts:
	asset.rb
	portfolio.rb