Final Sprint Develop-AK

This is the final pull request for Team-AK :) Will be merged tonight since we have our sprint review tomorrow morning ;)