Pushed all the introduction changes. The vocabulary introduction is working now in the JonatanBranch but needs to be tested to see if it works on this branch.
Merge remote-tracking branch 'origin/IntroductionBranch' into JonatanBranch
Remaining changes from master that were pulled from IntroductionBranch.