changes
Merge branch 'master' of github.com:calufa/tales-core
changes