fix gitignore
add missing files
Merge remote-tracking branch 'origin/develop'