remove text.txt from dev
develop version 1.7.5.dev
resolved conflicts with origin/develop in patches.py