Merge pull request #19 from lixiaopeng/master

Feature and Bugfix
fix merge bug
wrong write of img tag
change wrong white of img tag
Merge pull request #20 from zhangyaochun/master

fix merge bug
make requirejs uglify and rm uncessary code
change a better way to build
add enter key
Merge pull request #21 from zhangyaochun/master

make requirejs uglify and rm uncessary code