Merge branch 'master' of https://github.com/smariani/Seagull

Conflicts:
.gitignore
Conflitto