Merge branch 'master' of /Users/joostdieten/webStormProjects/scrummie with conflicts.