remove logfile
add license info
Merge branch 'develop'