Maps bitch
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/index.html