style example
Merge branch 'master' of github.com:formstamp/formstamp

Conflicts:
	demo/js/app.js
Merge branch 'master' of github.com:formstamp/formstamp