figuring out config changes
Cleanup of generic types (using parameterised types)
Merge branch 'cleanup' into feature-librum

* cleanup:
  Cleanup of generic types (using parameterised types)

Conflicts:
	etasdk/src/com/eTilbudsavis/etasdk/Eta.java