Bump version 0.5.7
Resolved conflits
Start development on 0.5.8