update
Merge branch 'master' of https://github.com/qpython-android/QEditor

Conflicts:
	src/com/hipipal/texteditor/TedActivity.java