Merge branch 'java-play-branch'
Added more documentation in order to complete the student transition
Merge branch 'master' into java-play-branch