added fillable fields
Merge branch 'matt_dev' into dev