Changes to rails scaffolding code
merged branch1 and master