ignore workspace.xml
Revert "ignore"

This reverts commit f46584f695df3c2c892518f983659b4f187fbdd2.
Merge branch 'develop'