database.yml rename
resolved_conflict
Merge branch 'master' of https://github.com/hardik101/wadt_2014
changed admin_email