Merge remote-tracking branch 'upstream/master'
add images for dev setup wiki
Merge pull request #46 from mtrubs/master

wiki images