maps api and info api
Merge remote-tracking branch 'origin/master' into backend_info

Conflicts:
	.gitignore
Merge pull request #11 from andreqi/backend_info

maps api and info api