Database changes primary
Reverting to Amit's changes. Nitin's database changes were uploaded last time. Reverting those
gitignore added config/environments/development.rb
Merge branch 'master' of https://github.com/mayukhroy/vms

Conflicts:
	config/environments/development.rb
Revert "Delete development.rb"

This reverts commit d4370846ff900cd15502cff33f55fa23590b69ee.