bug fix
Merge branch 'gh-pages' of github.com:audreyt/moe into gh-pages

Conflicts:
	map/main.js
	map/main.ls
Map: bugfix