Merge changes using autoform for Collections and Fields.
 Changes to be committed:
	modified:   client/template-collections.js
	modified:   selfdb.html