resolved conflicts
Merge branch 'devel-rhodri' of github:/rhodricusack/automaticanalysis into devel-rhodri