add fill draw tool
Merge branch 'develop'