Merge "Add multi assets folder support + assets in libraries."
Xavier Ducrohet [Wed, 6 Feb 2013 23:27:09 +0000 (23:27 +0000)]

Trivial merge