ignore data directory again
Merge branch 'develop'