Map circles
Merge branch 'master' of https://github.com/romaincarlier/lumiere

Conflicts:
	dev/public/assets/js/main.js