Merge branch 'evaluation-test-cases' of github.com:erikrikarddaniel/pfitmap into stable

Conflicts:
	Gemfile.lock
Merge branch 'stable' of github.com:erikrikarddaniel/pfitmap into stable

Conflicts:
	Gemfile.lock
Merge branch 'master' into stable

Conflicts:
	Gemfile.lock
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
resolved gemfile.lock
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
index taxhierarchy not on remote db
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable
Merge branch 'master' into stable