1. fix conflicts between gudstrap and Etown.
2. fix grunt test procedure error.
Merge pull request #2 from phariel/grunt-fix

1. fix conflicts between gudstrap and Etown.