Merge "Separated the prototype into plugin and test apps."
Xavier Ducrohet [Tue, 21 Aug 2012 18:46:11 +0000 (11:46 -0700)]

Trivial merge