Merge branch 'master' into development
added footer to report, added measured scaler
Merge branch 'development'