Merge scrum features into integration

Added some things to test on the server. not working 100%, don't merge into master until all bugs have been fixed