fix regexpes
merge branch 'master' of github.com:innoq/iqvoc

conflicts:
	test/functional/hierarchy_test.rb