Add Date
add gaode key
add customize plugin
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon
add pos
add pos.js
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon

Conflicts:
	README.md
modify addmarker
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon

Conflicts:
	README.md
add circle
add filter
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon

Conflicts:
	map/.pos.js.swp
Merge branch 'master' of https://github.com/andyzhuangyy/2014hackathon
Add Folder
Add like and dislike png_icons
add share
merge