hello
Merge branch 'master' of admin.gitolite:clauncher/anthCraft
remove helloworld
Merge branch 'release'
Merge pull request #1 from changyou/develop

更新
iconMask module
【修改】修改 preview中 icon-mask
【修改】未完成，差合并
【修改】代码重构
Merge pull request #3 from changyou/develop

mege changyou to me
Merge branch 'changyou/develop' into develop

Conflicts:
	app/views/waterDrop/emulatorPanel.html
Merge pull request #4 from changyou/develop

mege changyou to me
【优化】优化iconMask代码，去除图片宽度限定，去除无用代码。
【优化】修改undefined的判断方式
【优化】修改undefined的判断方式
【优化】!important 前增加空格。。。
Merge pull request #9 from xiaoliang2535/feature/iconMask

Feature/icon mask with canvas