Merge branch 'master' into development
histogram first version
next version
added JSON for histogram
added histogram
fixed bug in histogram
Merge branch 'development'