MBH: changed wording on conferences page
Merge branch 'master' of github.com:aims-group/sample