Merge pull request #75 from indykish/master

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

Conflicts:
	script/g
deleted the db file
Merge remote-tracking branch 'origin/master'