asyndent/ROQTI — pull request #6 by asyndent (2014-03-15 20:06:25+00:00)
Title: Merge remote-tracking branch 'origin/updates_portfolio' into updates_por...

...tfolio

Conflicts:
asset.rb
portfolio.rb