refactory imageMask
Merge branch 'develop' of github.com:changyou/anthCraft into develop
add empty [] for DI issue
1 change diy-icon position
2 add top-bar menu back
for suitting angular's api
add width and height
 resort icons
Merge branch 'develop' of https://github.com/zhang-ning/anthCraft into merge-zhangning
bug fix
Merge branch 'develop' of https://github.com/zhang-ning/anthCraft into merge-zhangning