Added the gammu daemon configuration file
Modified the local database.yml file
Solved conflicts