added david fry
Merge branch 'master' into david-dev
Merge branch 'maria-dev' into david-dev