modify the bigpicture
Merge remote branch 'upstream/master' into dev
add the big picture