Merge pull request #5 from Nuffield/dev_bugfix

committing changes from dev_bugfix to remote/bugfix
Merge pull request #6 from Nuffield/dev_bugfix

(1)from fox -dev_bugfix to remote/bugfix
Merge branch 'master' into dev_bugfix
Merge branch 'bugfix' of https://github.com/Nuffield/fox.git into dev_bugfix
Merge pull request #7 from Nuffield/dev_bugfix

Dev bugfix
Merge pull request #8 from Nuffield/dev_bugfix

(3)
fMerge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
Merge branch 'bugfix' of https://github.com/Nuffield/fox into dev_bugfix

Conflicts:
	Programme.community