1) add image button 2) change local testing
Merge branch 'dev' into gh-pages