Core Changes
Merge branch 'master' of https://github.com/yuripourre/etyllica.git

Conflicts:
	src/br/com/etyllica/core/Core.java