Merge pull request #70 from thomasalrin/master

package script fix
added vd button
changes
changes
Merge branch 'messings'
changed Gemfile
rectified
Changed
delete few temp files, .gitignore cocdb, minor fix to database.yml, rail4.1.2rc3, angular 1.3-beta 13
Merge branch 'morpheyesh-master'
bump rails to 4.1.2
Merge pull request #75 from indykish/master

bump rails to 4.1.2
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	script/g
deleted the db file
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	Gemfile.lock
Avoid [] nil method error when rails loads and nilavu.yml doesn't have some values
version upgrade for angularjs-busy
Merge pull request #78 from indykish/master

Fix for the [] nil method bug, and upgrade to angularjs.
angular js 1.3 beta16, update to seed to create a fake a/c.