upstream merge and code sprint additions
finalized the code sprints page