11261240 included live.js
11261930 grunt installed
11261940 ready to merge v1
Merge branch 'v1'