more LookupKeys

Conflicts:
	data/src/main/java/org/soluvas/data/impl/DataPackageImpl.java
K key generic is moved to method
Merge remote-tracking branch 'origin/2.0.x'

Conflicts:
	data/src/main/java/org/soluvas/data/impl/DataPackageImpl.java