retrying to delete Component class
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.py
	zeronimo/core.py