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

...tfolio

Conflicts:
	asset.rb
	portfolio.rb