support for nested fs-forms-for
Merge branch 'master' of github.com:formstamp/formstamp

Conflicts:
	bower.json
	demo/package.json
	package.json