some new class added
fetch-merge

Conflicts:
	Rakefile