new and _form partial done
fixed some merge conflicts
fixed database.yml merge