cocdb in megamhome
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/database.yml
yml file if
Merge pull request #82 from thomasalrin/master

cocdb in megamhome