Merge branch 'master' of github.com:pity7736/EjempyGtk

Conflicts:
	examples/entry.py
	examples/explain/boton.txt
	examples/explain/entry.txt
Merge branch 'master' of github.com:pity7736/EjempyGtk