new demo
Merge branch 'widgets-merge' of github.com:formstamp/formstamp into widgets-merge
demo refactoring
Merge branch 'widgets-merge' of github.com:formstamp/formstamp into widgets-merge