1. fix conflicts between gudstrap and Etown.
2. fix grunt test procedure error.