Merge branch 'master' into tilestream-plugin-layers-update
beautify javascript and fix a small syntax error
Merge branch 'tilestream-plugin-layers-update' into gem-reveal-demo2