update migration
update migration
update migration
Merge branch 'master' of github.com:jmaniv/nested_model

Conflicts:
	app/views/documents/_form.html.erb