Integrate edge into master and bump version

acabando com a bagunça