add *.log to gitignore
Merge branch 'master' into develop