Merge branch 'master' into development
updated docupage
fixed min/max filter
Merge branch 'development'