First revision of version 1.0.0
Version 1.0.0 published
Merge branch 'master' of https://github.com/andfoy/candelaria-maps

Conflicts:
	test
	tour
	tour~

Conflicts resolved