Merge branch 'develop'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/MareAtlantica/mareatlantica

Conflicts:
	.gitignore