removed some belongsTo/hasOne.
Fixed scaffolding template for textfields
Merge remote-tracking branch 'origin/master'