change *.slog to *.tlog in .gitignore
Merge branch 'develop'