Merge branch 'master' of https://github.com/mattrebor/emsiweb.git into rob
Merge pull request #100 from mattrebor/dan2

Dan2
Merge remote-tracking branch 'origin/master' into rob

Synch
Merge pull request #101 from mattrebor/rob

Rob
fix google map for south madrid, gent, and antwerpen
Merge pull request #102 from mattrebor/chui

fix google map for south madrid, gent, and antwerpen
Removed invalid characters
#80 bookstore changes. english/chinese labels