stop tracking log and database.yml
Merge branch 'dev' of https://github.com/rongyiwang/rongyi_term_cms into dev

# By dark
# Via dark
* 'dev' of https://github.com/rongyiwang/rongyi_term_cms:
  devise