While both the Galaxy S6 and Galaxy S6 Edge lack a removable battery, microSD slot, and water resistance, it looks like Galaxy S6 Active will bring them all back.
http://www.notebookcheck.net/Samsung-Galaxy-S6-Active-could-bring-back-the-microSD-slot.139158.0.html