Move where protos get added and change logic to allow option to not add extra elements on repeatables, even when empty
Merge branch 'master' into no-blank-repeatables

Conflicts:
	tests/php/test_fieldmanager_field.php
Merge pull request #161 from alleyinteractive/no-blank-repeatables

Move where protos get added and change logic to allow option to not add extra elements on repeatables, even when empty