Initial commit
Merge branch 'gh-pages' of github.com:formstamp/formstamp

Conflicts:
	README.md
Merge branch 'master' of github.com:formstamp/formstamp
merge with master
Merge branch 'master' of github.com:formstamp/formstamp

Conflicts:
	build/angular-w.js
	build/templates/templates.js
fix demo styles
fix styles for demo
Merge branch 'master' of github.com:formstamp/formstamp
Merge branch 'master' of github.com:formstamp/formstamp