added dev and master pills
attempt to fix broken image
Merge branch 'development'

Merging development into master