Merge pull request #1 from colorpeach/master

update
modifiy map-marker
modifiy map-marker
add some icons
add some icons
add some icons
add some icons
Merge pull request #5 from xinhuarao/master

add some icons
run grunt less
merge xinhuarao branch
Update package.json
Update README.md
Merge pull request #10 from colorpeach/master

merge xinhuarao branch