Merge develop into master

End of Sprint 2