Integrate edge into master and bump version

Acabando com a bagunça!