merge added text
fixed explitives
fixed explitives
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/OpenSpritz-Android/src/main/java/pro/dbro/openspritz/formats/Text.java
fixed explitives34