Merge pull request #1 from daniel-dgi/7.x

Port from 6.x -> 7.x
First pass at upgrading to latest version of flexpaper