Merge branch 'features/flexpaper' into develop
Flexpaper update
Configuration update on flexpaper
Finishing Flexpaper things