S-01009, TK-01006 corrected constants
Merge branch 'master' of git@github.com:serdel/Framework.git

Conflicts:
	Heracles/res/values/strings.xml