Merge remote-tracking branch 'upstream/master'
embed google map
merge upstream
add fancybox lib
tmp
fancybox ok
Merge branch 'test'
merge upstream
Merge pull request #1 from icarus4/master

add lightbox effect for google map