Merge branch 'beta5' of github.com:josankapo/FlyPaper into beta5
Merge branch 'beta5' of github.com:josankapo/FlyPaper into beta5